kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Anthony Minessale 2008-10-09 23:11:35 +00:00
parent 75dc5caf6d
commit be6e49cb3c
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mod/applications/mod_dptools/mod_dptools.c
View File

@ -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)

2
src/mod/endpoints/mod_sofia/mod_sofia.c
View File

@ -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);