kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

res_pjsip_pubsub: Prevent unload except during shutdown.

Browse Source 
Prevent unload of the module as certain pjsip initialization functions
cannot be reversed.  This required a reorder of the module_load so that
the non-reversable pjsip functions are not called until all potential
errors have been ruled out.

ASTERISK-24483

Change-Id: Iee900f20bdd6ee1bfe23efdec0d87765eadce8a7
This commit is contained in:
Corey Farrell
2017-10-18 14:41:25 -04:00
parent 63e536d97f
commit fb4ed70e62
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
res/res_pjsip_pubsub.c
View File

@@ -5415,35 +5415,22 @@ static int load_module(void)
sorcery = ast_sip_get_sorcery(); sorcery = ast_sip_get_sorcery();
pjsip_evsub_init_module(ast_sip_get_pjsip_endpoint());
if (!(sched = ast_sched_context_create())) { if (!(sched = ast_sched_context_create())) {
ast_log(LOG_ERROR, "Could not create scheduler for publication expiration\n"); ast_log(LOG_ERROR, "Could not create scheduler for publication expiration\n");
return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_DECLINE;
} }
pjsip_media_type_init2(&rlmi_media_type, "application", "rlmi+xml");
if (ast_sched_start_thread(sched)) { if (ast_sched_start_thread(sched)) {
ast_log(LOG_ERROR, "Could not start scheduler thread for publication expiration\n"); ast_log(LOG_ERROR, "Could not start scheduler thread for publication expiration\n");
ast_sched_context_destroy(sched); ast_sched_context_destroy(sched);
return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_DECLINE;
} }
pjsip_endpt_add_capability(ast_sip_get_pjsip_endpoint(), NULL, PJSIP_H_ALLOW, NULL, 1, &str_PUBLISH);
if (ast_sip_register_service(&pubsub_module)) {
ast_log(LOG_ERROR, "Could not register pubsub service\n");
ast_sched_context_destroy(sched);
return AST_MODULE_LOAD_DECLINE;
}
ast_sorcery_apply_config(sorcery, "res_pjsip_pubsub"); ast_sorcery_apply_config(sorcery, "res_pjsip_pubsub");
ast_sorcery_apply_default(sorcery, "subscription_persistence", "astdb", "subscription_persistence"); ast_sorcery_apply_default(sorcery, "subscription_persistence", "astdb", "subscription_persistence");
if (ast_sorcery_object_register(sorcery, "subscription_persistence", subscription_persistence_alloc, if (ast_sorcery_object_register(sorcery, "subscription_persistence", subscription_persistence_alloc,
NULL, NULL)) { NULL, NULL)) {
ast_log(LOG_ERROR, "Could not register subscription persistence object support\n"); ast_log(LOG_ERROR, "Could not register subscription persistence object support\n");
ast_sip_unregister_service(&pubsub_module);
ast_sched_context_destroy(sched); ast_sched_context_destroy(sched);
return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_DECLINE;
} }
@@ -5471,7 +5458,6 @@ static int load_module(void)
CHARFLDSET(struct subscription_persistence, contact_uri)); CHARFLDSET(struct subscription_persistence, contact_uri));
if (apply_list_configuration(sorcery)) { if (apply_list_configuration(sorcery)) {
ast_sip_unregister_service(&pubsub_module);
ast_sched_context_destroy(sched); ast_sched_context_destroy(sched);
return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_DECLINE;
} }
@@ -5480,7 +5466,6 @@ static int load_module(void)
if (ast_sorcery_object_register(sorcery, "inbound-publication", publication_resource_alloc, if (ast_sorcery_object_register(sorcery, "inbound-publication", publication_resource_alloc,
NULL, NULL)) { NULL, NULL)) {
ast_log(LOG_ERROR, "Could not register subscription persistence object support\n"); ast_log(LOG_ERROR, "Could not register subscription persistence object support\n");
ast_sip_unregister_service(&pubsub_module);
ast_sched_context_destroy(sched); ast_sched_context_destroy(sched);
return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_DECLINE;
} }
@@ -5490,6 +5475,27 @@ static int load_module(void)
ast_sorcery_object_fields_register(sorcery, "inbound-publication", "^event_", resource_event_handler, NULL); ast_sorcery_object_fields_register(sorcery, "inbound-publication", "^event_", resource_event_handler, NULL);
ast_sorcery_reload_object(sorcery, "inbound-publication"); ast_sorcery_reload_object(sorcery, "inbound-publication");
if (ast_sip_register_service(&pubsub_module)) {
ast_log(LOG_ERROR, "Could not register pubsub service\n");
ast_sched_context_destroy(sched);
return AST_MODULE_LOAD_DECLINE;
}
if (pjsip_evsub_init_module(ast_sip_get_pjsip_endpoint()) != PJ_SUCCESS) {
ast_log(LOG_ERROR, "Could not initialize pjsip evsub module.\n");
ast_sip_unregister_service(&pubsub_module);
ast_sched_context_destroy(sched);
return AST_MODULE_LOAD_DECLINE;
}
/* Once pjsip_evsub_init_module succeeds we cannot unload.
* Keep all module_load errors above this point. */
ast_module_shutdown_ref(ast_module_info->self);
pjsip_media_type_init2(&rlmi_media_type, "application", "rlmi+xml");
pjsip_endpt_add_capability(ast_sip_get_pjsip_endpoint(), NULL, PJSIP_H_ALLOW, NULL, 1, &str_PUBLISH);
if (ast_test_flag(&ast_options, AST_OPT_FLAG_FULLY_BOOTED)) { if (ast_test_flag(&ast_options, AST_OPT_FLAG_FULLY_BOOTED)) {
ast_sip_push_task(NULL, subscription_persistence_load, NULL); ast_sip_push_task(NULL, subscription_persistence_load, NULL);
} else { } else {