chan_motif / chan_pjsip: Fix incorrect "No such module" messages when reloading.

For chan_motif the direct return value of the underlying config options framework
was passed back. This can relay various states which the module loader would not
interpet as success. It has been changed so only on errors will it report back
an error.

For chan_pjsip the code implemented a dummy reload function which always
returned an error. This has been removed as all configuration is held within
res_pjsip instead.

ASTERISK-23651 #close
Reported by: Rusty Newton

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

diff --git a/channels/chan_motif.c b/channels/chan_motif.c
index b69371acfdf5572f967906b9416e11c3dc3cf43f..a8cb75b4c22a5fa8b83d85fbe4b6d08ae4c1dd6f 100644 (file)
--- a/channels/chan_motif.c
+++ b/channels/chan_motif.c
@@ -2785,7 +2785,11 @@ end:
 /*! \brief Reload module */
 static int reload(void)
 {
-       return aco_process_config(&cfg_info, 1);
+       if (aco_process_config(&cfg_info, 1) == ACO_PROCESS_ERROR) {
+               return -1;
+       }
+
+       return 0;
 }
 
 /*! \brief Unload the jingle channel from Asterisk */

diff --git a/channels/chan_pjsip.c b/channels/chan_pjsip.c
index 7819a910e86d412418bbb92767dc1a3b8b0e016f..c5528a75b526fbfdfe9a9b238306fae934f0da72 100644 (file)
--- a/channels/chan_pjsip.c
+++ b/channels/chan_pjsip.c
@@ -2259,12 +2259,6 @@ end:
        return AST_MODULE_LOAD_FAILURE;
 }
 
-/*! \brief Reload module */
-static int reload(void)
-{
-       return -1;
-}
-
 /*! \brief Unload the PJSIP channel from Asterisk */
 static int unload_module(void)
 {
@@ -2288,6 +2282,5 @@ static int unload_module(void)
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Channel Driver",
                .load = load_module,
                .unload = unload_module,
-               .reload = reload,
                .load_pri = AST_MODPRI_CHANNEL_DRIVER,
               );