From: Alexander Barton Date: Fri, 21 May 2010 21:47:28 +0000 (+0200) Subject: Don't set a penalty time when doing DNS lookups X-Git-Tag: rel-17-rc1~81 X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=commitdiff_plain;h=d4632a727fbee65cb1585c6f6e9968d830f23a19;hp=60f5dd5b29e701b3ab601addd3cdefb508acc7d1 Don't set a penalty time when doing DNS lookups The logic isn't as described in the source and intended by this code: ngIRCd doesn't wait for the asynchronous resolver process until the set penalty time is over, but until the forked process terminates or the initial connection timeout (= PongTimeout) triggers. So don't set the penalty time at all and remove the wrong comment. --- diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index dff9336f..0d82d530 100644 --- a/src/ngircd/conn.c +++ b/src/ngircd/conn.c @@ -1382,11 +1382,6 @@ New_Connection(int Sock) Resolve_Addr(&My_Connections[new_sock].proc_stat, &new_addr, identsock, cb_Read_Resolver_Result); - /* ngIRCd waits up to 4 seconds for the result of the asynchronous - * DNS and IDENT resolver subprocess using the "penalty" mechanism. - * If there are results earlier, the delay is aborted. */ - Conn_SetPenalty(new_sock, 4); - Account_Connection(); return new_sock; } /* New_Connection */