Commit Diff


commit - c8fb6a22584dae026557da9f7654cbc14e909da9
commit + 1249acfdba2ab619969c11042a130fc9ad9954de
blob - 8f0675ceacc4ccd696b36f082071c9069b1edf14
blob + bff3db61149f19cdb376afcb41f5f09d054a44c5
--- src/ngircd/conn.c
+++ src/ngircd/conn.c
@@ -17,7 +17,7 @@
 #include "portab.h"
 #include "io.h"
 
-static char UNUSED id[] = "$Id: conn.c,v 1.186 2005/12/09 09:26:55 fw Exp $";
+static char UNUSED id[] = "$Id: conn.c,v 1.187 2006/02/02 21:00:21 fw Exp $";
 
 #include "imp.h"
 #include <assert.h>
@@ -228,9 +228,6 @@ Conn_Init( void )
 
 	array_free( &My_Listeners );
 
-	/* Groesster File-Descriptor fuer select() */
-	Conn_MaxFD = 0;
-
 	/* Connection-Struktur initialisieren */
 	for( i = 0; i < Pool_Size; i++ ) Init_Conn_Struct( i );
 
@@ -462,7 +459,9 @@ Conn_Handler( void )
 #endif
 
 		/* Should the configuration be reloaded? */
-		if( NGIRCd_SignalRehash ) NGIRCd_Rehash( );
+		if (NGIRCd_SignalRehash) {
+			NGIRCd_Rehash( );
+		}
 
 		/* Check configured servers and established links */
 		Check_Servers( );
@@ -811,10 +810,10 @@ Conn_SyncServerStruct( void )
 	CONN_ID i;
 	int c;
 
-	for( i = 0; i < Pool_Size; i++ )
-	{
+	for( i = 0; i < Pool_Size; i++ ) {
 		/* Established connection? */
-		if( My_Connections[i].sock <= NONE ) continue;
+		if (My_Connections[i].sock < 0)
+			continue;
 
 		/* Server connection? */
 		client = Client_GetFromConn( i );
@@ -1616,7 +1615,7 @@ out:
 		n = Conf_GetServer( i );
 		assert(n > NONE );
 		if (n > NONE) {
-			Conf_Server[n].conn_id = NONE;  
+			Conf_Server[n].conn_id = NONE;
 			Init_Conn_Struct(i);
 		}
 	}
blob - 307e5bb53931554dce04fa326e1617956b4b8bc9
blob + 7d1c2e54c2a6a0991009476cf8f45d215ddd43a9
--- src/ngircd/conn.h
+++ src/ngircd/conn.h
@@ -8,7 +8,7 @@
  * (at your option) any later version.
  * Please read the file COPYING, README and AUTHORS for more information.
  *
- * $Id: conn.h,v 1.39 2005/09/12 19:10:20 fw Exp $
+ * $Id: conn.h,v 1.40 2006/02/02 21:00:22 fw Exp $
  *
  * Connection management (header)
  */
@@ -93,8 +93,6 @@ GLOBAL void Conn_Close PARAMS(( CONN_ID Idx, char *Log
 
 GLOBAL void Conn_SyncServerStruct PARAMS(( void ));
 
-GLOBAL int Conn_MaxFD;
-
 #endif