repo: ngircd
action: commit
revision: 
path_from: 
revision_from: 9b1c47220fafeacda1e83b4732e1c8574062aac6:
path_to: 
revision_to: 

commit 9b1c47220fafeacda1e83b4732e1c8574062aac6
Author: Florian Westphal 
Date:   Sun May 17 21:32:53 2009 +0200

    conn.c: fix NumConnections imbalance

    New_Server() can call Conn_Close() in its error paths,
    but that function decrements the number of current active
    connections. Thus we need to increment it earlier.

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c

--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -1696,6 +1696,8 @@ New_Server( int Server , ng_ipaddr_t *dest)
 		return;
 	}

+	/* Conn_Close() decrements this counter again */
+	NumConnections++;
 	Client_SetIntroducer( c, c );
 	Client_SetToken( c, TOKEN_OUTBOUND );

@@ -1725,7 +1727,6 @@ New_Server( int Server , ng_ipaddr_t *dest)
 		return;
 	}
 #endif
-	NumConnections++;
 	LogDebug("Registered new connection %d on socket %d (%ld in total).",
 		 new_sock, My_Connections[new_sock].sock, NumConnections);
 	Conn_OPTION_ADD( &My_Connections[new_sock], CONN_ISCONNECTING );

-----END OF PAGE-----