Remove ^M on line endings.

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

diff --git a/src/listener.c b/src/listener.c
index 5d2581bedbddfb8ff1c3db3c18522c9746fae1da..4147bfabe8f0792c77a3b417218e2b13bb597a60 100644 (file)
--- a/src/listener.c
+++ b/src/listener.c
@@ -41,12 +41,14 @@
 #include "reject.h"
 #include "s_conf.h"
 #include "hostmask.h"
+#include "sslproc.h"
+#include "hash.h"
 
 #ifndef INADDR_NONE
 #define INADDR_NONE ((unsigned int) 0xffffffff)
 #endif
 
-#if defined(NO_IN6ADDR_ANY) && defined(IPV6)
+#if defined(NO_IN6ADDR_ANY) && defined(RB_IPV6)
 static const struct in6_addr in6addr_any =
 { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } };
 #endif 
@@ -112,7 +114,7 @@ get_listener_name(const listener_t *listener)
        if(listener == NULL)
                return NULL;
 
-#ifdef IPV6
+#ifdef RB_IPV6
        if(listener->addr.ss_family == AF_INET6)
                port = ntohs(((const struct sockaddr_in6 *)&listener->addr)->sin6_port);
        else
@@ -138,14 +140,15 @@ show_ports(struct Client *source_p)
        {
                sendto_one_numeric(source_p, RPL_STATSPLINE, 
                                   form_str(RPL_STATSPLINE), 'P',
-#ifdef IPV6
+#ifdef RB_IPV6
                           ntohs(listener->addr.ss_family == AF_INET ? ((struct sockaddr_in *)&listener->addr)->sin_port :
                                 ((struct sockaddr_in6 *)&listener->addr)->sin6_port),
 #else
                           ntohs(((struct sockaddr_in *)&listener->addr)->sin_port),
 #endif
                           IsOperAdmin(source_p) ? listener->name : me.name,
-                          listener->ref_count, (listener->active) ? "active" : "disabled");
+                          listener->ref_count, (listener->active) ? "active" : "disabled",
+                          listener->ssl ? " ssl" : "");
        }
 }
 
@@ -175,7 +178,7 @@ inetport(listener_t *listener)
        
        F = rb_socket(GET_SS_FAMILY(&listener->addr), SOCK_STREAM, 0, "Listener socket");
 
-#ifdef IPV6
+#ifdef RB_IPV6
        if(listener->addr.ss_family == AF_INET6)
        {
                struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)&listener->addr;
@@ -270,7 +273,7 @@ find_listener(struct rb_sockaddr_storage *addr)
                                }
                                break;
                        }
-#ifdef IPV6
+#ifdef RB_IPV6
                        case AF_INET6:
                        {
                                struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)addr;
@@ -303,7 +306,7 @@ find_listener(struct rb_sockaddr_storage *addr)
  * the format "255.255.255.255"
  */
 void
-add_listener(int port, const char *vhost_ip, int family)
+add_listener(int port, const char *vhost_ip, int family, int ssl)
 {
        listener_t *listener;
        struct rb_sockaddr_storage vaddr;
@@ -323,7 +326,7 @@ add_listener(int port, const char *vhost_ip, int family)
                        if(inetpton(family, vhost_ip, &((struct sockaddr_in *)&vaddr)->sin_addr) <= 0)
                                return;
                } 
-#ifdef IPV6
+#ifdef RB_IPV6
                else
                {
                        if(inetpton(family, vhost_ip, &((struct sockaddr_in6 *)&vaddr)->sin6_addr) <= 0)
@@ -338,7 +341,7 @@ add_listener(int port, const char *vhost_ip, int family)
                        case AF_INET:
                                ((struct sockaddr_in *)&vaddr)->sin_addr.s_addr = INADDR_ANY;
                                break;
-#ifdef IPV6
+#ifdef RB_IPV6
                        case AF_INET6:
                                memcpy(&((struct sockaddr_in6 *)&vaddr)->sin6_addr, &in6addr_any, sizeof(struct in6_addr));
                                break;
@@ -353,7 +356,7 @@ add_listener(int port, const char *vhost_ip, int family)
                        SET_SS_LEN(&vaddr, sizeof(struct sockaddr_in));
                        ((struct sockaddr_in *)&vaddr)->sin_port = htons(port);
                        break;
-#ifdef IPV6
+#ifdef RB_IPV6
                case AF_INET6:
                        SET_SS_LEN(&vaddr, sizeof(struct sockaddr_in6));
                        ((struct sockaddr_in6 *)&vaddr)->sin6_port = htons(port);
@@ -375,6 +378,7 @@ add_listener(int port, const char *vhost_ip, int family)
        }
 
        listener->F = NULL;
+       listener->ssl = ssl;
 
        if(inetport(listener))
                listener->active = 1;
@@ -432,7 +436,7 @@ close_listeners()
  * any client list yet.
  */
 static void
-add_connection(struct Listener *listener, rb_fde_t *F, struct sockaddr *sai, int exempt)
+add_connection(struct Listener *listener, rb_fde_t *F, struct sockaddr *sai, void *ssl_ctl, int exempt)
 {
        struct Client *new_client;
        s_assert(NULL != listener);
@@ -456,8 +460,12 @@ add_connection(struct Listener *listener, rb_fde_t *F, struct sockaddr *sai, int
        strlcpy(new_client->host, new_client->sockhost, sizeof(new_client->host));
 
        new_client->localClient->F = F;
-
+       add_to_cli_fd_hash(new_client);
        new_client->localClient->listener = listener;
+       new_client->localClient->ssl_ctl = ssl_ctl;
+       if(ssl_ctl != NULL || rb_fd_ssl(F))
+               SetSSL(new_client);
+
        ++listener->ref_count;
 
        if(!exempt)
@@ -479,6 +487,12 @@ accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, voi
        struct ConfItem *aconf;
        static time_t last_oper_notice = 0;
 
+       if(listener->ssl && (!ssl_ok || !get_ssld_count()))
+       {
+               rb_close(F);
+               return 0;
+       }
+
        if((maxconnections - 10) < rb_get_fd(F)) /* XXX this is kinda bogus */
        {
                ++ServerStats.is_ref;
@@ -487,7 +501,7 @@ accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, voi
                 */
                if((last_oper_notice + 20) <= rb_current_time())
                {
-                       sendto_realops_flags(SNO_GENERAL, L_ALL,
+                       sendto_realops_snomask(SNO_GENERAL, L_ALL,
                                             "All connections in use. (%s)",
                                             get_listener_name(listener));
                        last_oper_notice = rb_current_time();
@@ -529,6 +543,16 @@ accept_precallback(rb_fde_t *F, struct sockaddr *addr, rb_socklen_t addrlen, voi
        return 1;
 }
 
+static void
+accept_ssld(rb_fde_t *F, struct sockaddr *addr, struct sockaddr *laddr, struct Listener *listener)
+{
+       ssl_ctl_t *ctl;
+       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);
+}
+
 static void
 accept_callback(rb_fde_t *F, int status, struct sockaddr *addr, rb_socklen_t addrlen, void *data)
 {
@@ -545,5 +569,8 @@ accept_callback(rb_fde_t *F, int status, struct sockaddr *addr, rb_socklen_t add
                rb_close(F);
        }
        
-       add_connection(listener, F, addr, 1);
+       if(listener->ssl)
+               accept_ssld(F, addr, (struct sockaddr *)&lip, listener);
+       else
+               add_connection(listener, F, addr, NULL, 1);
 }