Disable autoconnect for a server with excessive TS delta.

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

diff --git a/src/listener.c b/src/listener.c
index 153e1eb8df6c07fde01b2a23f591c12d2b90ee73..7f270a153f12feeeb7fce656232ebd55e9e88199 100644 (file)
--- a/src/listener.c
+++ b/src/listener.c
@@ -28,8 +28,7 @@
 #include "setup.h"
 #include "listener.h"
 #include "client.h"
-#include "irc_string.h"
-#include "sprintf_irc.h"
+#include "match.h"
 #include "ircd.h"
 #include "ircd_defs.h"
 #include "numeric.h"
@@ -184,7 +183,7 @@ inetport(listener_t *listener)
                struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)&listener->addr;
                if(!IN6_ARE_ADDR_EQUAL(&in6->sin6_addr, &in6addr_any))
                {
-                       inetntop(AF_INET6, &in6->sin6_addr, listener->vhost, sizeof(listener->vhost));
+                       rb_inet_ntop(AF_INET6, &in6->sin6_addr, listener->vhost, sizeof(listener->vhost));
                        listener->name = listener->vhost;
                }
        } else
@@ -193,7 +192,7 @@ inetport(listener_t *listener)
                struct sockaddr_in *in = (struct sockaddr_in *)&listener->addr;
                if(in->sin_addr.s_addr != INADDR_ANY)
                {
-                       inetntop(AF_INET, &in->sin_addr, listener->vhost, sizeof(listener->vhost));
+                       rb_inet_ntop(AF_INET, &in->sin_addr, listener->vhost, sizeof(listener->vhost));
                        listener->name = listener->vhost;
                }       
        }
@@ -323,13 +322,13 @@ add_listener(int port, const char *vhost_ip, int family, int ssl)
        {
                if(family == AF_INET)
                {
-                       if(inetpton(family, vhost_ip, &((struct sockaddr_in *)&vaddr)->sin_addr) <= 0)
+                       if(rb_inet_pton(family, vhost_ip, &((struct sockaddr_in *)&vaddr)->sin_addr) <= 0)
                                return;
                } 
 #ifdef RB_IPV6
                else
                {
-                       if(inetpton(family, vhost_ip, &((struct sockaddr_in6 *)&vaddr)->sin6_addr) <= 0)
+                       if(rb_inet_pton(family, vhost_ip, &((struct sockaddr_in6 *)&vaddr)->sin6_addr) <= 0)
                                return;
                
                }
@@ -436,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, struct sockaddr *lai, void *ssl_ctl)
 {
        struct Client *new_client;
        s_assert(NULL != listener);
@@ -448,12 +447,13 @@ add_connection(struct Listener *listener, rb_fde_t *F, struct sockaddr *sai, voi
        new_client = make_client(NULL);
 
        memcpy(&new_client->localClient->ip, sai, sizeof(struct rb_sockaddr_storage));
+       memcpy(&new_client->preClient->lip, lai, sizeof(struct rb_sockaddr_storage));
 
        /* 
         * copy address to 'sockhost' as a string, copy it to host too
         * so we have something valid to put into error messages...
         */
-       inetntop_sock((struct sockaddr *)&new_client->localClient->ip, new_client->sockhost, 
+       rb_inet_ntop_sock((struct sockaddr *)&new_client->localClient->ip, new_client->sockhost, 
                sizeof(new_client->sockhost));
 
 
@@ -468,17 +468,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)
 {
@@ -513,7 +507,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;
        
@@ -540,6 +534,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;
 }
 
@@ -550,7 +554,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, laddr, ctl);
 }
 
 static void
@@ -564,13 +568,13 @@ accept_callback(rb_fde_t *F, int status, struct sockaddr *addr, rb_socklen_t add
 
        if(getsockname(rb_get_fd(F), (struct sockaddr *) &lip, &locallen) < 0)
        {
-               /* this shouldn't fail so... */
-               /* XXX add logging of this */
+               /* this can fail if the connection disappeared in the meantime */
                rb_close(F);
+               return;
        }
        
        if(listener->ssl)
                accept_ssld(F, addr, (struct sockaddr *)&lip, listener);
        else
-               add_connection(listener, F, addr, NULL, 1);
+               add_connection(listener, F, addr, (struct sockaddr *)&lip, NULL);
 }