diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-05-19 13:33:08 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-05-19 13:33:08 -0500 |
| commit | f09f923514c44737693e424b3dab9afccfe0031f (patch) | |
| tree | 1ac0f800ae6184c762909b17a560d0dbf9b03e19 | |
| parent | 4e4a991d90241af1b023d07dc5ed8d8b1a73216c (diff) | |
| parent | 10de553c9d6922ebf3959b4fd7b50a2fad629eb1 (diff) | |
Merge "res_pjsip_outbound_publishing: After unloading the library won't load again" into 13
| -rw-r--r-- | res/res_pjsip_outbound_publish.c | 2 | ||||
| -rw-r--r-- | res/res_pjsip_publish_asterisk.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/res/res_pjsip_outbound_publish.c b/res/res_pjsip_outbound_publish.c index 7528e05ed..ab8a6c9bd 100644 --- a/res/res_pjsip_outbound_publish.c +++ b/res/res_pjsip_outbound_publish.c @@ -1228,6 +1228,7 @@ static int load_module(void) if (ast_sorcery_object_register(ast_sip_get_sorcery(), "outbound-publish", sip_outbound_publish_alloc, NULL, sip_outbound_publish_apply)) { + ast_log(LOG_ERROR, "Unable to register 'outbound-publish' type with sorcery\n"); return AST_MODULE_LOAD_DECLINE; } @@ -1300,6 +1301,7 @@ static int unload_module(void) "in the allowed time\n", unloading.count); } else { ast_verb(5, "All items successfully unpublished\n"); + ast_sorcery_object_unregister(ast_sip_get_sorcery(), "outbound-publish"); } return res; diff --git a/res/res_pjsip_publish_asterisk.c b/res/res_pjsip_publish_asterisk.c index 3218b0a0c..002d976d4 100644 --- a/res/res_pjsip_publish_asterisk.c +++ b/res/res_pjsip_publish_asterisk.c @@ -862,6 +862,7 @@ static int load_module(void) ast_sorcery_apply_default(ast_sip_get_sorcery(), "asterisk-publication", "config", "pjsip.conf,criteria=type=asterisk-publication"); if (ast_sorcery_object_register(ast_sip_get_sorcery(), "asterisk-publication", asterisk_publication_config_alloc, NULL, NULL)) { + ast_log(LOG_ERROR, "Unable to register 'asterisk-publication' type with sorcery\n"); return AST_MODULE_LOAD_DECLINE; } @@ -919,6 +920,7 @@ static int unload_module(void) ast_sip_unregister_publish_handler(&asterisk_mwi_publication_handler); ast_sip_unregister_event_publisher_handler(&asterisk_devicestate_publisher_handler); ast_sip_unregister_event_publisher_handler(&asterisk_mwi_publisher_handler); + ast_sorcery_object_unregister(ast_sip_get_sorcery(), "asterisk-publication"); return 0; } |