summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2007-06-28 15:13:38 +0000
committerFlorian Westphal <fw@strlen.de>2007-06-28 15:13:38 +0000
commitcd65e0a56ed2af507d76c582b54254c7e4b72970 (patch)
tree3289f72939e63e458b7e620ed7b11117bd065019 /src
parent2275add3271e2755775ab98510b8658402f79bc1 (diff)
downloadngircd-cd65e0a56ed2af507d76c582b54254c7e4b72970.tar.gz
ngircd-cd65e0a56ed2af507d76c582b54254c7e4b72970.zip
Don't connect to a server if a connection to another server within the same group
is in progress.
Diffstat (limited to 'src')
-rw-r--r--src/ngircd/conn.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c
index b904e2e4..2cbb806c 100644
--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -17,7 +17,7 @@
 #include "portab.h"
 #include "io.h"
 
-static char UNUSED id[] = "$Id: conn.c,v 1.209 2007/05/17 23:34:24 alex Exp $";
+static char UNUSED id[] = "$Id: conn.c,v 1.210 2007/06/28 15:13:39 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -1333,7 +1333,7 @@ Check_Servers( void )
 		if( Conf_Server[i].group > NONE ) {
 			for (n = 0; n < MAX_SERVERS; n++) {
 				if (n == i) continue;
-				if ((Conf_Server[n].conn_id > NONE) &&
+				if ((Conf_Server[n].conn_id != NONE) &&
 					(Conf_Server[n].group == Conf_Server[i].group))
 						break;
 			}
@@ -1346,7 +1346,7 @@ Check_Servers( void )
 			continue;
 
 		/* Okay, try to connect now */
-		Conf_Server[i].lasttry = time_now;
+		Conf_Server[i].conn_id = SERVER_WAIT;
 		assert(Resolve_Getfd(&Conf_Server[i].res_stat) < 0);
 		Resolve_Name(&Conf_Server[i].res_stat, Conf_Server[i].host, cb_Connect_to_Server);
 	}