From be6e49cb3c886e63714d6a42c1d4b873d94af940 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Thu, 9 Oct 2008 23:11:35 +0000 Subject: [PATCH] cancel proxy or no-media mode if you purposely answer or pre_answer git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9919 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/applications/mod_dptools/mod_dptools.c | 10 ++++++++-- src/mod/endpoints/mod_sofia/mod_sofia.c | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/mod/applications/mod_dptools/mod_dptools.c b/src/mod/applications/mod_dptools/mod_dptools.c index 94facf80e4..e786ecd77a 100644 --- a/src/mod/applications/mod_dptools/mod_dptools.c +++ b/src/mod/applications/mod_dptools/mod_dptools.c @@ -603,7 +603,10 @@ SWITCH_STANDARD_APP(set_name_function) SWITCH_STANDARD_APP(answer_function) { - switch_channel_answer(switch_core_session_get_channel(session)); + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_channel_clear_flag(channel, CF_PROXY_MEDIA); + switch_channel_clear_flag(channel, CF_PROXY_MODE); + switch_channel_answer(channel); } SWITCH_STANDARD_APP(presence_function) @@ -628,7 +631,10 @@ SWITCH_STANDARD_APP(presence_function) SWITCH_STANDARD_APP(pre_answer_function) { - switch_channel_pre_answer(switch_core_session_get_channel(session)); + switch_channel_t *channel = switch_core_session_get_channel(session); + switch_channel_clear_flag(channel, CF_PROXY_MEDIA); + switch_channel_clear_flag(channel, CF_PROXY_MODE); + switch_channel_pre_answer(channel); } SWITCH_STANDARD_APP(redirect_function) diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c index 902bfbf3bc..b8fe0f1b3f 100644 --- a/src/mod/endpoints/mod_sofia/mod_sofia.c +++ b/src/mod/endpoints/mod_sofia/mod_sofia.c @@ -1108,7 +1108,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi } } } else { - if (switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION)) { + if (switch_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION) || !tech_pvt->iananame) { switch_clear_flag_locked(tech_pvt, TFLAG_LATE_NEGOTIATION); if (!switch_channel_test_flag(tech_pvt->channel, CF_OUTBOUND)) { const char *r_sdp = switch_channel_get_variable(channel, SWITCH_R_SDP_VARIABLE);