X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/70747af52417d57b52c4ad7a6b41f9d571f4c682..5d2fe5036edadb7476799923fbaa59d99335d98f:/src/listener.c

diff --git a/src/listener.c b/src/listener.c
index b5e7869..0849ab6 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -438,7 +438,6 @@ static void
 add_connection(struct Listener *listener, rb_fde_t *F, struct sockaddr *sai, void *ssl_ctl)
 {
 	struct Client *new_client;
-	struct ConfItem *aconf;
 	s_assert(NULL != listener);
 
 	/* 
@@ -468,19 +467,11 @@ add_connection(struct Listener *listener, rb_fde_t *F, struct sockaddr *sai, voi
 
 	++listener->ref_count;
 
-	/* XXX these should be done in accept_precallback */
-	aconf = find_dline(sai, sai->sa_family);
-	if(aconf == NULL || aconf->status & CONF_EXEMPTDLINE)
-	{
-		if(check_reject(new_client))
-			return; 
-		if(add_unknown_ip(new_client))
-			return;
-	}
-
 	start_auth(new_client);
 }
 
+static const char *toofast = "ERROR :Reconnecting too fast, throttled.\r\n";
+
 static int
 accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, void *data)
 {
@@ -542,6 +533,16 @@ accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, voi
 		return 0;
 	}
 
+	if(check_reject(F, addr))
+		return 0;
+		
+	if(throttle_add(addr))
+	{
+		rb_write(F, toofast, strlen(toofast));
+		rb_close(F);
+		return 0;
+	}
+
 	return 1;
 }