remove RB_IPV6

[solanum.git] / ircd / listener.c

diff --git a/ircd/listener.c b/ircd/listener.c
index c1285be720a2a45862a293fd9a6364af1f8981fa..bdc5224264839c6e5eb91a021896a77b2e0b9821 100644 (file)
--- a/ircd/listener.c
+++ b/ircd/listener.c
@@ -43,7 +43,7 @@
 #include "s_assert.h"
 #include "logger.h"
 
-#if defined(NO_IN6ADDR_ANY) && defined(RB_IPV6)
+#if defined(NO_IN6ADDR_ANY)
 static const struct in6_addr in6addr_any =
 { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } } };
 #endif
@@ -164,7 +164,6 @@ inetport(struct Listener *listener)
 
        F = rb_socket(GET_SS_FAMILY(&listener->addr), SOCK_STREAM, 0, "Listener socket");
 
-#ifdef RB_IPV6
        if(GET_SS_FAMILY(&listener->addr) == AF_INET6)
        {
                struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)&listener->addr;
@@ -173,9 +172,7 @@ inetport(struct Listener *listener)
                        rb_inet_ntop(AF_INET6, &in6->sin6_addr, listener->vhost, sizeof(listener->vhost));
                        listener->name = listener->vhost;
                }
-       } else
-#endif
-       {
+       } else {
                struct sockaddr_in *in = (struct sockaddr_in *)&listener->addr;
                if(in->sin_addr.s_addr != INADDR_ANY)
                {
@@ -281,7 +278,6 @@ find_listener(struct rb_sockaddr_storage *addr)
                                }
                                break;
                        }
-#ifdef RB_IPV6
                        case AF_INET6:
                        {
                                struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)addr;
@@ -297,7 +293,6 @@ find_listener(struct rb_sockaddr_storage *addr)
                                break;
 
                        }
-#endif
 
                        default:
                                break;
@@ -334,14 +329,12 @@ add_listener(int port, const char *vhost_ip, int family, int ssl, int defer_acce
                        if(rb_inet_pton(family, vhost_ip, &((struct sockaddr_in *)&vaddr)->sin_addr) <= 0)
                                return;
                }
-#ifdef RB_IPV6
                else
                {
                        if(rb_inet_pton(family, vhost_ip, &((struct sockaddr_in6 *)&vaddr)->sin6_addr) <= 0)
                                return;
 
                }
-#endif
        } else
        {
                switch(family)
@@ -349,13 +342,11 @@ add_listener(int port, const char *vhost_ip, int family, int ssl, int defer_acce
                        case AF_INET:
                                ((struct sockaddr_in *)&vaddr)->sin_addr.s_addr = INADDR_ANY;
                                break;
-#ifdef RB_IPV6
                        case AF_INET6:
                                memcpy(&((struct sockaddr_in6 *)&vaddr)->sin6_addr, &in6addr_any, sizeof(struct in6_addr));
                                break;
                        default:
                                return;
-#endif
                }
        }
        switch(family)
@@ -365,13 +356,11 @@ add_listener(int port, const char *vhost_ip, int family, int ssl, int defer_acce
                        SET_SS_FAMILY(&vaddr, AF_INET);
                        SET_SS_PORT(&vaddr, htons(port));
                        break;
-#ifdef RB_IPV6
                case AF_INET6:
                        SET_SS_LEN(&vaddr, sizeof(struct sockaddr_in6));
                        SET_SS_FAMILY(&vaddr, AF_INET6);
                        SET_SS_PORT(&vaddr, htons(port));
                        break;
-#endif
                default:
                        break;
        }