Commit patch from danieldg that makes a ton of stuff const-safe for latest warn-happy...

[user/henk/code/inspircd.git] / src / socket.cpp

diff --git a/src/socket.cpp b/src/socket.cpp
index 09885eca16d3fd209f1e68f0eaebbbccb8701c1b..81f2a6f27d8a3509cc8b4ab958ddd3871fe22271 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -65,13 +65,24 @@ ListenSocket::~ListenSocket()
        }
 }
 
+
+// XXX this is a bit of an untidy way to avoid reallocating this constantly. also, we leak it on shutdown.. but that's kinda minor - w
+static sockaddr *sock_us;
+static sockaddr *client;
+static bool setup_sock = false;
+
 void ListenSocket::HandleEvent(EventType, int)
 {
-       sockaddr* sock_us = new sockaddr[2];    // our port number
-       sockaddr* client = new sockaddr[2];
        socklen_t uslen, length;                // length of our port number
        int incomingSockfd, in_port;
 
+       if (!setup_sock)
+       {
+               sock_us = new sockaddr[2];
+               client = new sockaddr[2];
+               setup_sock = true;
+       }
+
 #ifdef IPV6
        if (this->family == AF_INET6)
        {
@@ -117,7 +128,7 @@ void ListenSocket::HandleEvent(EventType, int)
                        }
                }
                ServerInstance->stats->statsAccept++;
-               User::AddClient(ServerInstance, incomingSockfd, in_port, false, this->family, client);
+               ServerInstance->Users->AddClient(ServerInstance, incomingSockfd, in_port, false, this->family, client);
        }
        else
        {
@@ -125,8 +136,6 @@ void ListenSocket::HandleEvent(EventType, int)
                ServerInstance->SE->Close(incomingSockfd);
                ServerInstance->stats->statsRefused++;
        }
-       delete[] client;
-       delete[] sock_us;
 }
 
 /* Match raw bytes using CIDR bit matching, used by higher level MatchCIDR() */
@@ -300,16 +309,16 @@ bool irc::sockets::MatchCIDR(const char* address, const char* cidr_mask, bool ma
  * It can only bind to IP addresses, if you wish to bind to hostnames
  * you should first resolve them using class 'Resolver'.
  */ 
-bool InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten)
+bool InspIRCd::BindSocket(int sockfd, int port, const char* addr, bool dolisten)
 {
        /* We allocate 2 of these, because sockaddr_in6 is larger than sockaddr (ugh, hax) */
-       sockaddr* server = new sockaddr[2];
-       memset(server,0,sizeof(sockaddr)*2);
+       sockaddr* servaddr = new sockaddr[2];
+       memset(servaddr,0,sizeof(sockaddr)*2);
 
        int ret, size;
 
        if (*addr == '*')
-               *addr = 0;
+               addr = "";
 
 #ifdef IPV6
        if (*addr)
@@ -321,13 +330,13 @@ bool InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten)
                        in6_addr addy;
                        if (inet_pton(AF_INET6, addr, &addy) < 1)
                        {
-                               delete[] server;
+                               delete[] servaddr;
                                return false;
                        }
 
-                       ((sockaddr_in6*)server)->sin6_family = AF_INET6;
-                       memcpy(&(((sockaddr_in6*)server)->sin6_addr), &addy, sizeof(in6_addr));
-                       ((sockaddr_in6*)server)->sin6_port = htons(port);
+                       ((sockaddr_in6*)servaddr)->sin6_family = AF_INET6;
+                       memcpy(&(((sockaddr_in6*)servaddr)->sin6_addr), &addy, sizeof(in6_addr));
+                       ((sockaddr_in6*)servaddr)->sin6_port = htons(port);
                        size = sizeof(sockaddr_in6);
                }
                else
@@ -336,13 +345,13 @@ bool InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten)
                        in_addr addy;
                        if (inet_pton(AF_INET, addr, &addy) < 1)
                        {
-                               delete[] server;
+                               delete[] servaddr;
                                return false;
                        }
 
-                       ((sockaddr_in*)server)->sin_family = AF_INET;
-                       ((sockaddr_in*)server)->sin_addr = addy;
-                       ((sockaddr_in*)server)->sin_port = htons(port);
+                       ((sockaddr_in*)servaddr)->sin_family = AF_INET;
+                       ((sockaddr_in*)servaddr)->sin_addr = addy;
+                       ((sockaddr_in*)servaddr)->sin_port = htons(port);
                        size = sizeof(sockaddr_in);
                }
        }
@@ -353,45 +362,45 @@ bool InspIRCd::BindSocket(int sockfd, int port, char* addr, bool dolisten)
                        /* Port -1: Means UDP IPV4 port binding - Special case
                         * used by DNS engine.
                         */
-                       ((sockaddr_in*)server)->sin_family = AF_INET;
-                       ((sockaddr_in*)server)->sin_addr.s_addr = htonl(INADDR_ANY);
-                       ((sockaddr_in*)server)->sin_port = 0;
+                       ((sockaddr_in*)servaddr)->sin_family = AF_INET;
+                       ((sockaddr_in*)servaddr)->sin_addr.s_addr = htonl(INADDR_ANY);
+                       ((sockaddr_in*)servaddr)->sin_port = 0;
                        size = sizeof(sockaddr_in);
                }
                else
                {
                        /* Theres no address here, default to ipv6 bind to all */
-                       ((sockaddr_in6*)server)->sin6_family = AF_INET6;
-                       memset(&(((sockaddr_in6*)server)->sin6_addr), 0, sizeof(in6_addr));
-                       ((sockaddr_in6*)server)->sin6_port = htons(port);
+                       ((sockaddr_in6*)servaddr)->sin6_family = AF_INET6;
+                       memset(&(((sockaddr_in6*)servaddr)->sin6_addr), 0, sizeof(in6_addr));
+                       ((sockaddr_in6*)servaddr)->sin6_port = htons(port);
                        size = sizeof(sockaddr_in6);
                }
        }
 #else
        /* If we aren't built with ipv6, the choice becomes simple */
-       ((sockaddr_in*)server)->sin_family = AF_INET;
+       ((sockaddr_in*)servaddr)->sin_family = AF_INET;
        if (*addr)
        {
                /* There is an address here. */
                in_addr addy;
                if (inet_pton(AF_INET, addr, &addy) < 1)
                {
-                       delete[] server;
+                       delete[] servaddr;
                        return false;
                }
-               ((sockaddr_in*)server)->sin_addr = addy;
+               ((sockaddr_in*)servaddr)->sin_addr = addy;
        }
        else
        {
                /* Bind ipv4 to all */
-               ((sockaddr_in*)server)->sin_addr.s_addr = htonl(INADDR_ANY);
+               ((sockaddr_in*)servaddr)->sin_addr.s_addr = htonl(INADDR_ANY);
        }
        /* Bind ipv4 port number */
-       ((sockaddr_in*)server)->sin_port = htons(port);
+       ((sockaddr_in*)servaddr)->sin_port = htons(port);
        size = sizeof(sockaddr_in);
 #endif
-       ret = SE->Bind(sockfd, server, size);
-       delete[] server;
+       ret = SE->Bind(sockfd, servaddr, size);
+       delete[] servaddr;
 
        if (ret < 0)
        {