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
........

Merged revisions 427981 from http://svn.asterisk.org/svn/asterisk/branches/12


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

2 files changed, 5 insertions, 8 deletions

diff --git a/channels/chan_motif.c b/channels/chan_motif.c
index e5e72283a..48f1b1fc7 100644
--- a/channels/chan_motif.c
+++ b/channels/chan_motif.c
@@ -2801,7 +2801,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 f200a05d3..11445464a 100644
--- a/channels/chan_pjsip.c
+++ b/channels/chan_pjsip.c
@@ -2292,12 +2292,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)
 {
@@ -2323,6 +2317,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "PJSIP Channel Driver"
 		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
-		.reload = reload,
 		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
 	       );