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

make respond 302 work in mod_sofia 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10038 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2008-10-15 22:16:18 +00:00
parent 06e770bac3
commit 8ec42371bb
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -993,13 +993,16 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
*/ */
break; break;
case SWITCH_MESSAGE_INDICATE_REDIRECT: case SWITCH_MESSAGE_INDICATE_REDIRECT:
if (msg->string_arg) { if (!switch_strlen_zero(msg->string_arg)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Re-directing to %s\n", msg->string_arg); if (!switch_channel_test_flag(channel, CF_ANSWERED)) {
nua_respond(tech_pvt->nh, SIP_302_MOVED_TEMPORARILY, SIPTAG_CONTACT_STR(msg->string_arg), TAG_END()); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Re-directing to %s\n", msg->string_arg);
switch_set_flag_locked(tech_pvt, TFLAG_BYE); nua_respond(tech_pvt->nh, SIP_302_MOVED_TEMPORARILY, SIPTAG_CONTACT_STR(msg->string_arg), TAG_END());
switch_set_flag_locked(tech_pvt, TFLAG_BYE);
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Too late for Re-directing to %s, already answered\n", msg->string_arg);
}
} }
break; break;
case SWITCH_MESSAGE_INDICATE_DEFLECT: case SWITCH_MESSAGE_INDICATE_DEFLECT:
{ {
char ref_to[128] = ""; char ref_to[128] = "";
@ -1036,7 +1039,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
code = 488; code = 488;
} }
if (switch_strlen_zero(reason) && code != 407) { if (switch_strlen_zero(reason) && code != 407 && code != 302) {
reason = sip_status_phrase(code); reason = sip_status_phrase(code);
if (switch_strlen_zero(reason)) { if (switch_strlen_zero(reason)) {
reason = "Because"; reason = "Because";
@ -1074,6 +1077,13 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
if (!switch_channel_test_flag(channel, CF_ANSWERED)) { if (!switch_channel_test_flag(channel, CF_ANSWERED)) {
switch_set_flag_locked(tech_pvt, TFLAG_BYE); switch_set_flag_locked(tech_pvt, TFLAG_BYE);
} }
} else if (code == 302 && !switch_strlen_zero(msg->string_arg)) {
char * p = strchr(msg->string_arg, ' ');
*p++ = '\0';
msg->message_id = SWITCH_MESSAGE_INDICATE_REDIRECT;
msg->string_arg = p;
switch_core_session_receive_message(session, msg);
goto end;
} else { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Responding with %d [%s]\n", code, reason); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Responding with %d [%s]\n", code, reason);