[asterisk-commits] beagles: trunk r374020 - in /trunk: ./ main/message.c res/res_xmpp.c

[SVN commits to the Asterisk project]

Author: beagles
Date: Fri Sep 28 08:04:11 2012
New Revision: 374020

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=374020
Log:
Reset hangup flags on channels created through messages and cleanup globals
in res_xmpp on unload.

This patch fixes an issue where hangup flags were not being reset on a
channel, affecting subsequent use of that channel. The patch also adds some
additional cleanup to res_xmpp to fix an issue with reloading the module.

(closes ASTERISK-20360)
Reported by: Noah Engelberth 
Tested by: beagles
Review: https://reviewboard.asterisk.org/r/2134/
........

Merged revisions 374019 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/main/message.c
    trunk/res/res_xmpp.c

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

Modified: trunk/main/message.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/message.c?view=diff&rev=374020&r1=374019&r2=374020
==============================================================================
--- trunk/main/message.c (original)
+++ trunk/main/message.c Fri Sep 28 08:04:11 2012
@@ -752,6 +752,10 @@
 	if (msg_ds) {
 		ast_channel_datastore_add(chan, msg_ds);
 	}
+	/*
+	 * Clear softhangup flags.
+	 */
+	ast_channel_clear_softhangup(chan, AST_SOFTHANGUP_ALL);
 
 	ast_channel_unlock(chan);
 }

Modified: trunk/res/res_xmpp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_xmpp.c?view=diff&rev=374020&r1=374019&r2=374020
==============================================================================
--- trunk/res/res_xmpp.c (original)
+++ trunk/res/res_xmpp.c Fri Sep 28 08:04:11 2012
@@ -4204,6 +4204,8 @@
 	ast_manager_unregister("JabberSend");
 	ast_custom_function_unregister(&jabberstatus_function);
 	ast_custom_function_unregister(&jabberreceive_function);
+	aco_info_destroy(&cfg_info);
+	ao2_global_obj_release(globals);
 
 	ast_cond_destroy(&message_received_condition);
 	ast_mutex_destroy(&messagelock);