comment to fix egd (not work currently)

[irc/rqf/shadowircd.git] / src / listener.c

diff --git a/src/listener.c b/src/listener.c
index 60289fb2c56341c373df03741a6917588815f8cf..0849ab63d265d3203e989d9f1971ff88490e92b0 100644 (file)
--- a/src/listener.c
+++ b/src/listener.c
@@ -435,7 +435,7 @@ close_listeners()
  * any client list yet.
  */
 static void
-add_connection(struct Listener *listener, rb_fde_t *F, struct sockaddr *sai, void *ssl_ctl, int exempt)
+add_connection(struct Listener *listener, rb_fde_t *F, struct sockaddr *sai, void *ssl_ctl)
 {
        struct Client *new_client;
        s_assert(NULL != listener);
@@ -467,17 +467,11 @@ add_connection(struct Listener *listener, rb_fde_t *F, struct sockaddr *sai, voi
 
        ++listener->ref_count;
 
-       if(!exempt)
-       {
-               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)
 {
@@ -512,7 +506,7 @@ accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, voi
                return 0;
        }
 
-       aconf = find_dline(addr, AF_INET);
+       aconf = find_dline(addr, addr->sa_family);
        if(aconf != NULL && (aconf->status & CONF_EXEMPTDLINE))
                return 1;
        
@@ -539,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;
 }
 
@@ -549,7 +553,7 @@ accept_ssld(rb_fde_t *F, struct sockaddr *addr, struct sockaddr *laddr, struct L
        rb_fde_t *xF[2];
        rb_socketpair(AF_UNIX, SOCK_STREAM, 0, &xF[0], &xF[1], "Incoming ssld Connection");
        ctl = start_ssld_accept(F, xF[1], rb_get_fd(xF[0])); /* this will close F for us */
-       add_connection(listener, xF[0], addr, ctl, 1);
+       add_connection(listener, xF[0], addr, ctl);
 }
 
 static void
@@ -571,5 +575,5 @@ accept_callback(rb_fde_t *F, int status, struct sockaddr *addr, rb_socklen_t add
        if(listener->ssl)
                accept_ssld(F, addr, (struct sockaddr *)&lip, listener);
        else
-               add_connection(listener, F, addr, NULL, 1);
+               add_connection(listener, F, addr, NULL);
 }