repo: ngircd
action: commit
revision: 
path_from: 
revision_from: a2e26aad1e106aac256991a3d0c43c6c3fda7d4b:
path_to: 
revision_to: 

commit a2e26aad1e106aac256991a3d0c43c6c3fda7d4b
Author: Alexander Barton 
Date:   Sat Mar 9 17:58:10 2013 +0100

    Conn_Handler(): Don't test for penalty times

    The Conn_Handler() main loop calls Handle_Buffer() which checks for the
    "penalty time" of each client itself, so don't do it twice.

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

--- a/src/ngircd/conn.c
+++ b/src/ngircd/conn.c
@@ -853,8 +853,7 @@ Conn_Handler(void)
 		/* Look for non-empty read buffers ... */
 		for (i = 0; i < Pool_Size; i++) {
 			if ((My_Connections[i].sock > NONE)
-			    && (array_bytes(&My_Connections[i].rbuf) > 0)
-			    && (My_Connections[i].delaytime <= t)) {
+			    && (array_bytes(&My_Connections[i].rbuf) > 0)) {
 				/* ... and try to handle the received data */
 				bytes_processed = Handle_Buffer(i);
 				/* if we processed data, and there might be

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