kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-06-08 05:54:45 +00:00
Code Issues Projects Releases Wiki Activity

FS-3354 --resolve

Browse Source
This commit is contained in:
Anthony Minessale 2011-06-20 10:07:01 -05:00
parent f8cda53998
commit 3be64cbf62
2 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5233,11 +5233,6 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_sofia_shutdown)
switch_console_set_complete("del sofia"); switch_console_set_complete("del sofia");
switch_mutex_lock(mod_sofia_globals.mutex); switch_mutex_lock(mod_sofia_globals.mutex);
for (i = 0; i < mod_sofia_globals.msg_queue_len; i++) {
switch_queue_push(mod_sofia_globals.msg_queue[i], NULL);
}
if (mod_sofia_globals.running == 1) { if (mod_sofia_globals.running == 1) {
mod_sofia_globals.running = 0; mod_sofia_globals.running = 0;
} }
@ -5259,11 +5254,17 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_sofia_shutdown)
} }
} }
for (i = 0; i < mod_sofia_globals.msg_queue_len; i++) {
switch_queue_push(mod_sofia_globals.msg_queue[i], NULL);
}
for (i = 0; i < mod_sofia_globals.msg_queue_len; i++) { for (i = 0; i < mod_sofia_globals.msg_queue_len; i++) {
switch_status_t st; switch_status_t st;
switch_thread_join(&st, mod_sofia_globals.msg_queue_thread[i]); switch_thread_join(&st, mod_sofia_globals.msg_queue_thread[i]);
} }
//switch_yield(1000000); //switch_yield(1000000);
su_deinit(); su_deinit();

26
src/mod/endpoints/mod_sofia/sofia.c
View File

@ -949,8 +949,9 @@ static void our_sofia_event_callback(nua_event_t event,
switch_channel_set_flag(channel, CF_MEDIA_ACK); switch_channel_set_flag(channel, CF_MEDIA_ACK);
break; break;
case nua_r_shutdown: case nua_r_shutdown:
if (status >= 200) if (status >= 200) {
su_root_break(profile->s_root); su_root_break(profile->s_root);
}
break; break;
case nua_r_message: case nua_r_message:
sofia_handle_sip_r_message(status, profile, nh, sip); sofia_handle_sip_r_message(status, profile, nh, sip);
@ -1127,24 +1128,10 @@ void *SWITCH_THREAD_FUNC sofia_msg_thread_run(switch_thread_t *thread, void *obj
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "MSG Thread Started\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "MSG Thread Started\n");
while (mod_sofia_globals.running == 1) {
if (switch_queue_pop(q, &pop) == SWITCH_STATUS_SUCCESS) {
sofia_dispatch_event_t *de = (sofia_dispatch_event_t *) pop;
if (!pop) { while(switch_queue_pop(q, &pop) == SWITCH_STATUS_SUCCESS && pop) {
break;
}
sofia_process_dispatch_event(&de);
}
}
while (switch_queue_trypop(q, &pop) == SWITCH_STATUS_SUCCESS && pop) {
sofia_dispatch_event_t *de = (sofia_dispatch_event_t *) pop; sofia_dispatch_event_t *de = (sofia_dispatch_event_t *) pop;
nua_handle_unref(de->nh); sofia_process_dispatch_event(&de);
nua_destroy_event(de->event);
free(de);
} }
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "MSG Thread Ended\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "MSG Thread Ended\n");
@ -1193,6 +1180,11 @@ static void sofia_queue_message(sofia_dispatch_event_t *de)
{ {
int idx = 0; int idx = 0;
if (mod_sofia_globals.running == 0) {
sofia_process_dispatch_event(&de);
return;
}
again: again:
switch_mutex_lock(mod_sofia_globals.mutex); switch_mutex_lock(mod_sofia_globals.mutex);