Some global structs cleaned up a bit in their initalization and declarations.

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

diff --git a/src/s_serv.c b/src/s_serv.c
index 4570c5c42ee30b66f1d2624d35bb728fd74847bd..0b417680c73043d24b8df2802d0d9d1103815119 100644 (file)
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -1031,7 +1031,7 @@ server_estab(struct Client *client_p)
        {
                if(client_p != serv_list.head->data || serv_list.head->next)
                {
-                       ServerStats->is_ref++;
+                       ServerStats.is_ref++;
                        sendto_one(client_p, "ERROR :I'm a leaf not a hub");
                        return exit_client(client_p, client_p, client_p, "I'm a leaf");
                }
@@ -1498,7 +1498,7 @@ serv_connect(struct server_conf *server_p, struct Client *by)
                return 0;
        }
 
-#ifdef IPV6
+#ifdef RB_IPV6
        if(theiripnum.ss_family == AF_INET6)
                ((struct sockaddr_in6 *)&theiripnum)->sin6_port = htons(server_p->port);
        else
@@ -1586,7 +1586,7 @@ serv_connect(struct server_conf *server_p, struct Client *by)
                SET_SS_LEN(&myipnum, sizeof(struct sockaddr_in));
        }
        
-#ifdef IPV6
+#ifdef RB_IPV6
        else if((server_p->aftype == AF_INET6) && ServerInfo.specific_ipv6_vhost)
        {
                memcpy(&myipnum, &ServerInfo.ip6, sizeof(myipnum));
@@ -1599,7 +1599,7 @@ serv_connect(struct server_conf *server_p, struct Client *by)
        {
                /* log */
                ilog(L_SERVER, "Connecting to %s[%s] port %d (%s)", server_p->name, server_p->host, server_p->port,
-#ifdef IPV6
+#ifdef RB_IPV6
                                server_p->aftype == AF_INET6 ? "IPv6" :
 #endif
                                (server_p->aftype == AF_INET ? "IPv4" : "?"));
@@ -1615,7 +1615,7 @@ serv_connect(struct server_conf *server_p, struct Client *by)
        /* log */
        inetntop_sock((struct sockaddr *)&myipnum, vhoststr, sizeof vhoststr);
        ilog(L_SERVER, "Connecting to %s[%s] port %d (%s) (vhost %s)", server_p->name, server_p->host, server_p->port,
-#ifdef IPV6
+#ifdef RB_IPV6
                        server_p->aftype == AF_INET6 ? "IPv6" :
 #endif
                        (server_p->aftype == AF_INET ? "IPv4" : "?"), vhoststr);