[asterisk-commits] file: branch 11 r378917 - /branches/11/res/res_xmpp.c

[SVN commits to the Asterisk project]

Author: file
Date: Fri Jan 11 17:04:53 2013
New Revision: 378917

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=378917
Log:
Retain XMPP filters across reconnections so external modules continue to function as expected.

Previously if an XMPP client reconnected any filters added by an external module were lost.
This issue exhibited itself with chan_motif not receiving and reacting to Jingle signaling.

(closes issue ASTERISK-20916)
Reported by: kuj

Modified:
    branches/11/res/res_xmpp.c

Modified: branches/11/res/res_xmpp.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/res/res_xmpp.c?view=diff&rev=378917&r1=378916&r2=378917
==============================================================================
--- branches/11/res/res_xmpp.c (original)
+++ branches/11/res/res_xmpp.c Fri Jan 11 17:04:53 2013
@@ -431,6 +431,10 @@
 
 	ast_xmpp_client_disconnect(client);
 
+	if (client->filter) {
+		iks_filter_delete(client->filter);
+	}
+
 	if (client->stack) {
 		iks_stack_delete(client->stack);
 	}
@@ -3394,12 +3398,6 @@
 		iks_disconnect(client->parser);
 	}
 
-	/* Disconnecting the parser and going back to a disconnected state means any hooks should no longer be present */
-	if (client->filter) {
-		iks_filter_delete(client->filter);
-		client->filter = NULL;
-	}
-
 	client->state = XMPP_STATE_DISCONNECTED;
 
 	return 0;