ASTERISK-24811: Add ast_sorcery_apply_config() to res_pjsip_publish_asterisk.
authorGeorge Joseph <george.joseph@fairview5.com>
Fri, 20 Feb 2015 17:53:33 +0000 (17:53 +0000)
committerGeorge Joseph <george.joseph@fairview5.com>
Fri, 20 Feb 2015 17:53:33 +0000 (17:53 +0000)
Matt Hoskins reported that res_pjsip_publish_asterisk wouldn't pull config from
realtime.  Turns out it was just missing a call ast_sorcery_apply_config().

res_pjsip_acl was missing it as well, so I added it.  The other pjsip modules
looked OK.

ASTERISK-24811 #close
Reported-by: Matt Hoskins
Tested-by: George Joseph
Tested-by: Matt Hoskins
patches:
res_pjsip_publish_asterisk.c.patch submitted by Matt Hoskins (license 6688)

Review: https://reviewboard.asterisk.org/r/4433/
........

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

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@432035 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_pjsip_acl.c
res/res_pjsip_publish_asterisk.c

index 115d1b8..ec9f3ae 100644 (file)
@@ -269,6 +269,7 @@ static int load_module(void)
 {
        CHECK_PJSIP_MODULE_LOADED();
 
+       ast_sorcery_apply_config(ast_sip_get_sorcery(), SIP_SORCERY_ACL_TYPE);
        ast_sorcery_apply_default(ast_sip_get_sorcery(), SIP_SORCERY_ACL_TYPE,
                                  "config", "pjsip.conf,criteria=type=acl");
 
index e1b095e..c0d3b90 100644 (file)
@@ -858,6 +858,7 @@ static int load_module(void)
 {
        CHECK_PJSIP_PUBSUB_MODULE_LOADED();
 
+       ast_sorcery_apply_config(ast_sip_get_sorcery(), "asterisk-publication");
        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)) {