[svn-commits] file: trunk r423581 - in /trunk: ./ res/res_pjsip_notify.c

[SVN commits to the Digium repositories]

Author: file
Date: Fri Sep 19 14:51:50 2014
New Revision: 423581

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=423581
Log:
res_pjsip_notify: Fix crash on unload/load and don't say the module doesn't exist on reload.

When unloading the module did not unregister the CLI commands causing a crash upon
load when they were registered again.

When reloading the module the return value from the config options framework was not
checked to determine if an error occurred or not. This caused a message to be output
saying the module did not exist when reloading if no changes were present.

AST-1433 #close
AST-1434 #close
........

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

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

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip_notify.c

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

Modified: trunk/res/res_pjsip_notify.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_notify.c?view=diff&rev=423581&r1=423580&r2=423581
==============================================================================
--- trunk/res/res_pjsip_notify.c (original)
+++ trunk/res/res_pjsip_notify.c Fri Sep 19 14:51:50 2014
@@ -1007,13 +1007,17 @@
 
 static int reload_module(void)
 {
-	return aco_process_config(&notify_cfg, 1) ?
-		AST_MODULE_LOAD_DECLINE : 0;
+	if (aco_process_config(&notify_cfg, 1) == ACO_PROCESS_ERROR) {
+		return AST_MODULE_LOAD_DECLINE;
+	}
+
+	return 0;
 }
 
 static int unload_module(void)
 {
 	ast_manager_unregister("PJSIPNotify");
+	ast_cli_unregister_multiple(cli_options, ARRAY_LEN(cli_options));
 	aco_info_destroy(&notify_cfg);
 
 	return 0;