[asterisk-commits] file: branch 13 r427982 - in /branches/13: ./ channels/

[SVN commits to the Asterisk project]

Author: file
Date: Sat Nov 15 13:00:40 2014
New Revision: 427982

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=427982
Log:
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

Modified:
    branches/13/   (props changed)
    branches/13/channels/chan_motif.c
    branches/13/channels/chan_pjsip.c

Propchange: branches/13/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: branches/13/channels/chan_motif.c
URL: http://svnview.digium.com/svn/asterisk/branches/13/channels/chan_motif.c?view=diff&rev=427982&r1=427981&r2=427982
==============================================================================
--- branches/13/channels/chan_motif.c (original)
+++ branches/13/channels/chan_motif.c Sat Nov 15 13:00:40 2014
@@ -2801,7 +2801,11 @@
 /*! \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 */

Modified: branches/13/channels/chan_pjsip.c
URL: http://svnview.digium.com/svn/asterisk/branches/13/channels/chan_pjsip.c?view=diff&rev=427982&r1=427981&r2=427982
==============================================================================
--- branches/13/channels/chan_pjsip.c (original)
+++ branches/13/channels/chan_pjsip.c Sat Nov 15 13:00:40 2014
@@ -2292,12 +2292,6 @@
 	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 @@
 		.support_level = AST_MODULE_SUPPORT_CORE,
 		.load = load_module,
 		.unload = unload_module,
-		.reload = reload,
 		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
 	       );