kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_pjsip: Enable unload of all modules at shutdown.

Browse Source 
* Move most of res_pjsip:module_unload to unload_pjsip to resolve crashes
  caused by running PJSIP functions from non-PJSIP threads.
* Remove call to pjsip_endpt_destroy(ast_pjsip_endpoint), it was causing
  crashes in some cases.  In theory pj_shutdown() should take care of this.
* Mark res_pjsip_keepalive and res_pjsip_session as allowed to unload at
  shutdown.
* Resolve leaked config global in res_pjsip_notify.
* Unregister pubsub pjsip service module.
* Implement cleanup for res_pjsip_session.

ASTERISK-24731 #close
Reported by: Corey Farrell
Review: https://reviewboard.asterisk.org/r/4498/
........

Merged revisions 433469 from http://svn.asterisk.org/svn/asterisk/branches/13


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@433470 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Corey Farrell
2015-03-26 17:47:42 +00:00
parent ab674f67b5
commit d7fc85e69d
5 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
res/res_pjsip.c
View File

@@ -3520,21 +3520,6 @@ static int reload_module(void)
static int unload_pjsip(void *data)
{
ast_cli_unregister_multiple(cli_commands, ARRAY_LEN(cli_commands));
if (memory_pool) {
pj_pool_release(memory_pool);
memory_pool = NULL;
}
if (ast_pjsip_endpoint) {
pjsip_endpt_destroy(ast_pjsip_endpoint);
ast_pjsip_endpoint = NULL;
}
pj_caching_pool_destroy(&caching_pool);
pj_shutdown();
return 0;
}
static int unload_module(void)
{
ast_res_pjsip_cleanup_options_handling();
internal_sip_destroy_outbound_authentication();
ast_sip_destroy_distributor();
@@ -3545,6 +3530,18 @@ static int unload_module(void)
if (monitor_thread) {
stop_monitor_thread();
}
if (memory_pool) {
pj_pool_release(memory_pool);
memory_pool = NULL;
}
ast_pjsip_endpoint = NULL;
pj_caching_pool_destroy(&caching_pool);
pj_shutdown();
return 0;
}
static int unload_module(void)
{
/* The thread this is called from cannot call PJSIP/PJLIB functions,
* so we have to push the work to the threadpool to handle
*/

2
res/res_pjsip_keepalive.c
View File

@@ -244,7 +244,7 @@ static int load_module(void)
ast_sorcery_observer_add(ast_sip_get_sorcery(), "global", &keepalive_global_observer);
ast_sorcery_reload_object(ast_sip_get_sorcery(), "global");
ast_module_ref(ast_module_info->self);
ast_module_shutdown_ref(ast_module_info->self);
return AST_MODULE_LOAD_SUCCESS;
}

1
res/res_pjsip_notify.c
View File

@@ -1021,6 +1021,7 @@ static int unload_module(void)
ast_manager_unregister("PJSIPNotify");
ast_cli_unregister_multiple(cli_options, ARRAY_LEN(cli_options));
aco_info_destroy(&notify_cfg);
ao2_global_obj_release(globals);
return 0;
}

1
res/res_pjsip_pubsub.c
View File

@@ -4286,6 +4286,7 @@ static int unload_module(void)
ast_manager_unregister(AMI_SHOW_SUBSCRIPTIONS_INBOUND);
ast_manager_unregister("PJSIPShowResourceLists");
ast_sip_unregister_service(&pubsub_module);
if (sched) {
ast_sched_context_destroy(sched);
}

8
res/res_pjsip_session.c
View File

@@ -2641,14 +2641,18 @@ static int load_module(void)
}
ast_sip_register_service(&session_reinvite_module);
ast_module_ref(ast_module_info->self);
ast_module_shutdown_ref(ast_module_info->self);
return AST_MODULE_LOAD_SUCCESS;
}
static int unload_module(void)
{
/* This will never get called as this module can't be unloaded */
ast_sip_unregister_service(&session_reinvite_module);
ast_sip_unregister_service(&session_module);
ast_sorcery_delete(ast_sip_get_sorcery(), nat_hook);
ao2_cleanup(nat_hook);
ao2_cleanup(sdp_handlers);
return 0;
}