Author: anthm Date: Mon Nov 27 12:12:40 2006 New Revision: 3460 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/switch_ivr.c Log: update Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Mon Nov 27 12:12:40 2006 @@ -465,8 +465,7 @@ 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; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Mon Nov 27 12:12:40 2006 @@ -2548,12 +2548,6 @@ } } 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); Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Mon Nov 27 12:12:40 2006 @@ -2436,13 +2436,13 @@ 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) {