[svn-commits] phsultan: trunk r95794 - /trunk/res/res_jabber.c

[SVN commits to the Digium repositories]

Author: phsultan
Date: Wed Jan  2 05:34:26 2008
New Revision: 95794

URL: http://svn.digium.com/view/asterisk?view=rev&rev=95794
Log:
Set stream flags to zero upon initialization.

When the XMPP over TLS/SSL connection resets for some reason, it is
wrongly believed as being secured, which makes the re-connection
process endlessly fail. This was reported by mvanbaak in issue #11644.

Modified:
    trunk/res/res_jabber.c

Modified: trunk/res/res_jabber.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_jabber.c?view=diff&rev=95794&r1=95793&r2=95794
==============================================================================
--- trunk/res/res_jabber.c (original)
+++ trunk/res/res_jabber.c Wed Jan  2 05:34:26 2008
@@ -2256,8 +2256,13 @@
  */
 static int aji_initialize(struct aji_client *client)
 {
+	int connected = IKS_NET_NOCONN;
+	
+	/* reset stream flags */
+	client->stream_flags = 0;
+
 	/* If it's a component, connect to user, otherwise, connect to server */
-	int connected = iks_connect_via(client->p, S_OR(client->serverhost, client->jid->server), client->port, client->component ? client->user : client->jid->server);
+	connected = iks_connect_via(client->p, S_OR(client->serverhost, client->jid->server), client->port, client->component ? client->user : client->jid->server);
 
 	if (connected == IKS_NET_NOCONN) {
 		ast_log(LOG_ERROR, "JABBER ERROR: No Connection\n");