kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 11:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Retain XMPP filters across reconnections so external modules continue to function as expected.

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

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


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@378918 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2013-01-11 23:05:38 +00:00
parent 7695ea2643
commit c5ec471766
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/res_xmpp.c
View File

@@ -440,6 +440,10 @@ static void xmpp_client_destructor(void *obj)
ast_xmpp_client_disconnect(client);
if (client->filter) {
iks_filter_delete(client->filter);
}
if (client->stack) {
iks_stack_delete(client->stack);
}
@@ -3408,12 +3412,6 @@ int ast_xmpp_client_disconnect(struct ast_xmpp_client *client)
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;