[asterisk-commits] trunk r29847 - /trunk/res/res_jabber.c

[asterisk-commits at lists.digium.com]

Author: mogorman
Date: Tue May 23 16:18:07 2006
New Revision: 29847

URL: http://svn.digium.com/view/asterisk?rev=29847&view=rev
Log:
hmm still need a way to get rid of connections
later on.

Modified:
    trunk/res/res_jabber.c

Modified: trunk/res/res_jabber.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_jabber.c?rev=29847&r1=29846&r2=29847&view=diff
==============================================================================
--- trunk/res/res_jabber.c (original)
+++ trunk/res/res_jabber.c Tue May 23 16:18:07 2006
@@ -1334,25 +1334,23 @@
 		if (res != IKS_OK) {
 			while(res != IKS_OK) {
 				if(option_verbose > 3) ast_verbose("JABBER: reconnecting.\n");
+				res = aji_reconnect(client);
 				sleep(4);
-				res = aji_reconnect(client);
 			}
 		}
 		res = iks_recv(client->p, 1);
 		client->timeout--;
 		if (res == IKS_HOOK) {
 			ast_log(LOG_WARNING, "JABBER: Got hook event.\n");
-			break;
 		} else if (res == IKS_NET_TLSFAIL) {
 			ast_log(LOG_WARNING, "JABBER:  Failure in tls.\n");
-			break;
 		} else if (client->timeout == 0 && client->state != AJI_CONNECTED) {
 			res = -1;
 			ast_log(LOG_WARNING, "JABBER:  Network Timeout\n");
 		} else if (res == IKS_NET_RWERR) {
 			ast_log(LOG_WARNING, "JABBER: socket read error\n");
 		}
-	} while (res == IKS_OK);
+	} while (client);
 	ASTOBJ_UNREF(client, aji_client_destroy);
 	return 0;
 }