kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-01 11:10:24 +00:00
Code Issues Projects Releases Wiki Activity

fix goofy 183 madness

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3004 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2006-10-08 15:51:10 +00:00
parent 3667da49b6
commit d44c204f5b
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1916,7 +1916,7 @@ static void sip_i_state(int status,
if (channel) { if (channel) {
if (r_sdp) { if (r_sdp) {
if (switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { if (switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) {
switch_channel_pre_answer(channel); switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA);
return; return;
} else { } else {
sdp_parser_t *parser = sdp_parse(tech_pvt->home, r_sdp, (int)strlen(r_sdp), 0); sdp_parser_t *parser = sdp_parse(tech_pvt->home, r_sdp, (int)strlen(r_sdp), 0);
@ -1938,7 +1938,7 @@ static void sip_i_state(int status,
tech_choose_port(tech_pvt); tech_choose_port(tech_pvt);
activate_rtp(tech_pvt); activate_rtp(tech_pvt);
switch_channel_set_variable(channel, "endpoint_disposition", "EARLY MEDIA"); switch_channel_set_variable(channel, "endpoint_disposition", "EARLY MEDIA");
switch_channel_pre_answer(channel); switch_set_flag_locked(tech_pvt, TFLAG_EARLY_MEDIA);
return; return;
} }
switch_channel_set_variable(channel, "endpoint_disposition", "NO CODECS"); switch_channel_set_variable(channel, "endpoint_disposition", "NO CODECS");
@ -2067,7 +2067,7 @@ static void sip_i_state(int status,
if (r_sdp) { if (r_sdp) {
if (switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) { if (switch_test_flag(tech_pvt, TFLAG_NOMEDIA)) {
switch_set_flag_locked(tech_pvt, TFLAG_ANS); switch_set_flag_locked(tech_pvt, TFLAG_ANS);
switch_channel_answer(channel); switch_channel_set_flag(channel, CF_ANSWERED);
return; return;
} else { } else {
sdp_parser_t *parser = sdp_parse(tech_pvt->home, r_sdp, (int)strlen(r_sdp), 0); sdp_parser_t *parser = sdp_parse(tech_pvt->home, r_sdp, (int)strlen(r_sdp), 0);
@ -2090,7 +2090,7 @@ static void sip_i_state(int status,
switch_channel_set_variable(channel, "endpoint_disposition", "ANSWER"); switch_channel_set_variable(channel, "endpoint_disposition", "ANSWER");
tech_choose_port(tech_pvt); tech_choose_port(tech_pvt);
activate_rtp(tech_pvt); activate_rtp(tech_pvt);
switch_channel_answer(channel); switch_channel_set_flag(channel, CF_ANSWERED);
return; return;
} }
@ -2100,7 +2100,7 @@ static void sip_i_state(int status,
} else if (switch_test_flag(tech_pvt, TFLAG_EARLY_MEDIA)) { } else if (switch_test_flag(tech_pvt, TFLAG_EARLY_MEDIA)) {
switch_set_flag_locked(tech_pvt, TFLAG_ANS); switch_set_flag_locked(tech_pvt, TFLAG_ANS);
switch_channel_set_variable(channel, "endpoint_disposition", "ANSWER"); switch_channel_set_variable(channel, "endpoint_disposition", "ANSWER");
switch_channel_answer(channel); switch_channel_set_flag(channel, CF_ANSWERED);
return; return;
} //else probably an ack } //else probably an ack
} }

4
src/switch_channel.c
View File

@ -950,6 +950,10 @@ SWITCH_DECLARE(switch_status_t) switch_channel_perform_pre_answer(switch_channel
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
if (switch_channel_test_flag(channel, CF_EARLY_MEDIA)) {
return SWITCH_STATUS_SUCCESS;
}
msg.message_id = SWITCH_MESSAGE_INDICATE_PROGRESS; msg.message_id = SWITCH_MESSAGE_INDICATE_PROGRESS;
msg.from = channel->name; msg.from = channel->name;
status = switch_core_session_message_send(uuid, &msg); status = switch_core_session_message_send(uuid, &msg);