Module: ngircd.git Branch: master Commit: d4632a727fbee65cb1585c6f6e9968d830f23a19 URL: http://ngircd.barton.de/cgi-bin/gitweb.cgi?p=ngircd.git&a=commit;h=d4632...

Author: Alexander Barton alex@barton.de Date: Fri May 21 23:47:28 2010 +0200

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.

---

src/ngircd/conn.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-)

diff --git a/src/ngircd/conn.c b/src/ngircd/conn.c index dff9336..0d82d53 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 */