From c08e943e44d0ef9b3335d9a0473d6abb7588ae83 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 27 Nov 2006 17:12:40 +0000 Subject: [PATCH] update git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3460 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/include/switch_types.h | 3 +-- src/mod/endpoints/mod_sofia/mod_sofia.c | 6 ------ src/switch_ivr.c | 4 ++-- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/include/switch_types.h b/src/include/switch_types.h index 0e56c0c13d..e553d54605 100644 --- a/src/include/switch_types.h +++ b/src/include/switch_types.h @@ -465,8 +465,7 @@ typedef enum { CF_CONTROLLED = (1 << 12), CF_NOMEDIA = (1 << 13), CF_SUSPEND = (1 << 14), - CF_EVENT_PARSE = (1 << 15), - CF_NO_EARLY = (1 << 16) + CF_EVENT_PARSE = (1 << 15) } switch_channel_flag_t; diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c index dcf5e6111a..6e1c949813 100644 --- a/src/mod/endpoints/mod_sofia/mod_sofia.c +++ b/src/mod/endpoints/mod_sofia/mod_sofia.c @@ -2548,12 +2548,6 @@ static void sip_i_state(int status, } } if (r_sdp) { - if (switch_channel_test_flag(channel, CF_NO_EARLY)) { - //ignore 183 but how do we say we dont want it and not end the call - //nua_respond(nh, SIP_403_FORBIDDEN, TAG_END()); - return; - } - if (switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA); switch_channel_set_flag(channel, CF_EARLY_MEDIA); diff --git a/src/switch_ivr.c b/src/switch_ivr.c index 7f01da6293..9286fe078b 100644 --- a/src/switch_ivr.c +++ b/src/switch_ivr.c @@ -2436,13 +2436,13 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_originate(switch_core_session_t *sess peer_sessions[i] = NULL; continue; } - //switch_channel_set_flag(peer_channels[i], CF_NO_EARLY); + switch_core_session_read_lock(peer_sessions[i]); pool = NULL; peer_channels[i] = switch_core_session_get_channel(peer_sessions[i]); assert(peer_channels[i] != NULL); - + if (table == &noop_state_handler) { table = NULL; } else if (!table) {