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

fix messed up switch statement 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3877 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2006-12-31 19:54:16 +00:00
parent 314ddb3e24
commit 18c3fe5cf9
2 changed files with 20 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4441,19 +4441,30 @@ static void event_callback(nua_event_t event,
case nua_r_shutdown: case nua_r_shutdown:
case nua_r_get_params: case nua_r_get_params:
case nua_r_invite: case nua_r_invite:
case nua_r_unregister:
case nua_r_options:
case nua_i_fork:
case nua_r_info:
case nua_r_bye:
case nua_i_bye:
case nua_r_unsubscribe:
case nua_r_publish:
case nua_r_message:
case nua_r_notify:
case nua_i_notify:
case nua_i_cancel:
case nua_i_error:
case nua_i_active:
case nua_i_ack:
case nua_i_terminated:
case nua_r_set_params:
break; break;
case nua_r_register: case nua_r_register:
sip_r_register(status, phrase, nua, profile, nh, sofia_private, sip, tags); sip_r_register(status, phrase, nua, profile, nh, sofia_private, sip, tags);
break; break;
case nua_r_unregister:
break;
case nua_r_options:
break;
case nua_i_options: case nua_i_options:
sip_i_options(status, phrase, nua, profile, nh, sofia_private, sip, tags); sip_i_options(status, phrase, nua, profile, nh, sofia_private, sip, tags);
break; break;
case nua_i_fork:
break;
case nua_i_invite: case nua_i_invite:
if (!session) { if (!session) {
sip_i_invite(nua, profile, nh, sofia_private, sip, tags); sip_i_invite(nua, profile, nh, sofia_private, sip, tags);
@ -4470,13 +4481,9 @@ static void event_callback(nua_event_t event,
case nua_i_state: case nua_i_state:
sip_i_state(status, phrase, nua, profile, nh, sofia_private, sip, tags); sip_i_state(status, phrase, nua, profile, nh, sofia_private, sip, tags);
break; break;
case nua_r_bye:
case nua_i_bye:
case nua_i_message: case nua_i_message:
sip_i_message(status, phrase, nua, profile, nh, sofia_private, sip, tags); sip_i_message(status, phrase, nua, profile, nh, sofia_private, sip, tags);
break; break;
case nua_r_info:
break;
case nua_i_info: case nua_i_info:
sip_i_info(nua, profile, nh, session, sip, tags); sip_i_info(nua, profile, nh, session, sip, tags);
break; break;
@ -4493,28 +4500,14 @@ static void event_callback(nua_event_t event,
case nua_i_subscribe: case nua_i_subscribe:
sip_i_subscribe(status, phrase, nua, profile, nh, sofia_private, sip, tags); sip_i_subscribe(status, phrase, nua, profile, nh, sofia_private, sip, tags);
break; break;
case nua_r_unsubscribe:
case nua_r_publish:
case nua_r_message:
case nua_r_notify:
case nua_i_notify:
case nua_i_cancel:
case nua_i_error:
case nua_i_active:
case nua_i_ack:
case nua_i_terminated:
case nua_r_set_params:
break;
default: default:
if (status > 100) if (status > 100) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s: unknown event %d: %03d %s\n", switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s: unknown event %d: %03d %s\n",
nua_event_name (event), event, status, phrase); nua_event_name (event), event, status, phrase);
else } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s: unknown event %d\n", nua_event_name (event), event); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s: unknown event %d\n", nua_event_name (event), event);
}
break; break;
} }
done: done:

11
src/switch_ivr.c
View File

@ -3306,17 +3306,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_multi_threaded_bridge(switch_core_ses
switch_event_fire(&event); switch_event_fire(&event);
} }
if (switch_channel_test_flag(caller_channel, CF_TRANSFER) && !switch_channel_test_flag(peer_channel, CF_TRANSFER)) {
//switch_channel_hangup(peer_channel, SWITCH_CAUSE_NORMAL_CLEARING);
//switch_yield(2000000);
}
if (!switch_channel_test_flag(caller_channel, CF_TRANSFER) && switch_channel_test_flag(peer_channel, CF_TRANSFER)) {
//switch_channel_hangup(caller_channel, SWITCH_CAUSE_NORMAL_CLEARING);
//switch_yield(2000000);
}
this_audio_thread->objs[0] = NULL; this_audio_thread->objs[0] = NULL;
this_audio_thread->objs[1] = NULL; this_audio_thread->objs[1] = NULL;
this_audio_thread->objs[2] = NULL; this_audio_thread->objs[2] = NULL;