[ekg2-commit] r4231 - in trunk: ekg plugins/jabber: trunk/ekg/net.c trunk/plugins/jabber/jabber.c

[SVN commit]

Author: peres
Date: 2008-08-08 11:56:50 +0200 (Fri, 08 Aug 2008)
New Revision: 4231

Modified:
   trunk/ekg/net.c
   trunk/plugins/jabber/jabber.c
Log:

Connect timeout setting.



Modified: trunk/ekg/net.c
===================================================================
--- trunk/ekg/net.c	2008-08-08 09:10:41 UTC (rev 4230)
+++ trunk/ekg/net.c	2008-08-08 09:56:50 UTC (rev 4231)
@@ -488,6 +488,8 @@
 		int len, fd, family, connret;
 		watch_t *w;
 
+		const int timeout = session_int_get(s, "connect_timeout");
+
 		do {
 			int one = 1;
 
@@ -519,8 +521,10 @@
 			}
 
 			w = watch_add(s->plugin, fd, WATCH_WRITE, ekg_connect_handler, c);
-			watch_timeout_set(w, 10 /* XXX */);
 
+			if (timeout)
+				watch_timeout_set(w, timeout);
+
 			xfree(addr);
 			return 1;
 		} while (0);

Modified: trunk/plugins/jabber/jabber.c
===================================================================
--- trunk/plugins/jabber/jabber.c	2008-08-08 09:10:41 UTC (rev 4230)
+++ trunk/plugins/jabber/jabber.c	2008-08-08 09:56:50 UTC (rev 4231)
@@ -1569,6 +1569,7 @@
 	PLUGIN_VAR_ADD("auto_reconnect", 	VAR_INT, "0", 0, NULL),
 	PLUGIN_VAR_ADD("auto_xa", 		VAR_INT, "0", 0, NULL),
 	PLUGIN_VAR_ADD("auto_xa_descr", 	VAR_STR, 0, 0, NULL),
+	PLUGIN_VAR_ADD("connect_timeout",	VAR_INT, "30", 0, NULL),
 	PLUGIN_VAR_ADD("disable_sasl",		VAR_INT, "0", 0, NULL),
 	PLUGIN_VAR_ADD("display_notify", 	VAR_INT, "-1", 0, NULL),
 	PLUGIN_VAR_ADD("display_server_features", VAR_INT, "1", 0, NULL),