ircd/listener: un-obsoleteify comments

[solanum.git] / ircd / listener.c

diff --git a/ircd/listener.c b/ircd/listener.c
index 9fa0ca1bc89db201522e5f87e5c87470818c4157..fda86f9675a861d752e92a86c1bf49a3f5c13544 100644 (file)
--- a/ircd/listener.c
+++ b/ircd/listener.c
@@ -34,7 +34,7 @@
 #include "s_newconf.h"
 #include "s_stats.h"
 #include "send.h"
-#include "s_auth.h"
+#include "authd.h"
 #include "reject.h"
 #include "s_conf.h"
 #include "hostmask.h"
@@ -106,7 +106,7 @@ static uint16_t
 get_listener_port(const struct Listener *listener)
 {
 #ifdef RB_IPV6
-       if(listener->addr.ss_family == AF_INET6)
+       if(GET_SS_FAMILY(&listener->addr) == AF_INET6)
                return ntohs(((const struct sockaddr_in6 *)&listener->addr)->sin6_port);
        else
 #endif
@@ -180,7 +180,7 @@ inetport(struct Listener *listener)
        F = rb_socket(GET_SS_FAMILY(&listener->addr), SOCK_STREAM, 0, "Listener socket");
 
 #ifdef RB_IPV6
-       if(listener->addr.ss_family == AF_INET6)
+       if(GET_SS_FAMILY(&listener->addr) == AF_INET6)
        {
                struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)&listener->addr;
                if(!IN6_ARE_ADDR_EQUAL(&in6->sin6_addr, &in6addr_any))
@@ -223,6 +223,8 @@ inetport(struct Listener *listener)
        /*
         * XXX - we don't want to do all this crap for a listener
         * set_sock_opts(listener);
+        *
+        * FIXME - doesn't this belong in librb? --Elizafox
         */
        if(setsockopt(rb_get_fd(F), SOL_SOCKET, SO_REUSEADDR, (char *) &opt, sizeof(opt)))
        {
@@ -236,11 +238,7 @@ inetport(struct Listener *listener)
                return 0;
        }
 
-       /*
-        * Bind a port to listen for new connections if port is non-null,
-        * else assume it is already open and try get something from it.
-        */
-
+       /* FIXME - doesn't this belong in librb? --Elizafox */
        if(bind(rb_get_fd(F), (struct sockaddr *) &listener->addr, GET_SS_LEN(&listener->addr)))
        {
                errstr = strerror(rb_get_sockerr(F));
@@ -279,10 +277,10 @@ find_listener(struct rb_sockaddr_storage *addr)
 
        for (listener = ListenerPollList; listener; listener = listener->next)
        {
-               if(addr->ss_family != listener->addr.ss_family)
+               if(GET_SS_FAMILY(addr) != GET_SS_FAMILY(&listener->addr))
                        continue;
 
-               switch(addr->ss_family)
+               switch(GET_SS_FAMILY(addr))
                {
                        case AF_INET:
                        {
@@ -342,7 +340,7 @@ add_listener(int port, const char *vhost_ip, int family, int ssl, int defer_acce
        if(port == 0)
                return;
        memset(&vaddr, 0, sizeof(vaddr));
-       vaddr.ss_family = family;
+       SET_SS_FAMILY(&vaddr, family);
 
        if(vhost_ip != NULL)
        {
@@ -481,7 +479,7 @@ add_connection(struct Listener *listener, rb_fde_t *F, struct sockaddr *sai, str
                        free_client(new_client);
                        return;
                }
-               new_client->localClient->ssl_ctl = start_ssld_accept(F, xF[1], new_client->localClient->connid);        /* this will close F for us */
+               new_client->localClient->ssl_ctl = start_ssld_accept(F, xF[1], connid_get(new_client));        /* this will close F for us */
                if(new_client->localClient->ssl_ctl == NULL)
                {
                        free_client(new_client);
@@ -509,7 +507,7 @@ add_connection(struct Listener *listener, rb_fde_t *F, struct sockaddr *sai, str
 
        ++listener->ref_count;
 
-       start_auth(new_client);
+       authd_initiate_client(new_client);
 }
 
 static const char *toofast = "ERROR :Reconnecting too fast, throttled.\r\n";