We were lucky this one didnt bring down the whole devnet (see cmd_part.cpp diff)

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

diff --git a/src/socket.cpp b/src/socket.cpp
index e045df1f99610a38db7b6df0f3af34d94a25033b..fc48d219eaf0f2f4185e2de42c964f0b8f9ab860 100644 (file)
--- a/src/socket.cpp
+++ b/src/socket.cpp
@@ -20,6 +20,12 @@
 
 using namespace irc::sockets;
 
+/* Private static member data must be initialized in this manner */
+unsigned int ListenSocket::socketcount = 0;
+sockaddr* ListenSocket::sock_us = NULL;
+sockaddr* ListenSocket::client = NULL;
+sockaddr* ListenSocket::raddr = NULL;
+
 /* Used when comparing CIDR masks for the modulus bits left over.
  * A lot of ircd's seem to do this:
  * ((-1) << (8 - (mask % 8)))
@@ -51,6 +57,15 @@ ListenSocket::ListenSocket(InspIRCd* Instance, int port, char* addr) : ServerIns
                this->family = AF_INET;
                Instance->SE->AddFd(this);
        }
+       /* Saves needless allocations */
+       if (socketcount == 0)
+       {
+               /* All instances of ListenSocket share these, so reference count it */
+               sock_us = new sockaddr[2];
+               client = new sockaddr[2];
+               raddr = new sockaddr[2];
+       }
+       socketcount++;
 }
 
 ListenSocket::~ListenSocket()
@@ -63,26 +78,20 @@ ListenSocket::~ListenSocket()
                        ServerInstance->Logs->Log("SOCKET", DEBUG,"Failed to cancel listener: %s", strerror(errno));
                this->fd = -1;
        }
+       socketcount--;
+       if (socketcount == 0)
+       {
+               delete[] sock_us;
+               delete[] client;
+               delete[] raddr;
+       }
 }
 
-
-// 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)
 {
        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)
        {
@@ -101,34 +110,38 @@ void ListenSocket::HandleEvent(EventType, int)
        if ((incomingSockfd > -1) && (!ServerInstance->SE->GetSockName(this, sock_us, &uslen)))
        {
                char buf[MAXBUF];
+               char target[MAXBUF];
+
+               *target = *buf = '\0';
+
 #ifdef IPV6
                if (this->family == AF_INET6)
                {
-                       inet_ntop(AF_INET6, &((const sockaddr_in6*)client)->sin6_addr, buf, sizeof(buf));
                        in_port = ntohs(((sockaddr_in6*)sock_us)->sin6_port);
+                       inet_ntop(AF_INET6, &((const sockaddr_in6*)client)->sin6_addr, buf, sizeof(buf));
+                       socklen_t raddrsz = sizeof(sockaddr_in6);
+                       if (getpeername(incomingSockfd, (sockaddr*) raddr, &raddrsz) == 0)
+                               inet_ntop(AF_INET6, &((const sockaddr_in6*)raddr)->sin6_addr, target, sizeof(target));
+                       else
+                               ServerInstance->Logs->Log("SOCKET", DEBUG, "Can't get peername: %s", strerror(errno));
                }
                else
 #endif
                {
                        inet_ntop(AF_INET, &((const sockaddr_in*)client)->sin_addr, buf, sizeof(buf));
                        in_port = ntohs(((sockaddr_in*)sock_us)->sin_port);
+                       socklen_t raddrsz = sizeof(sockaddr_in);
+                       if (getpeername(incomingSockfd, (sockaddr*) raddr, &raddrsz) == 0)
+                               inet_ntop(AF_INET, &((const sockaddr_in*)raddr)->sin_addr, target, sizeof(target));
+                       else
+                               ServerInstance->Logs->Log("SOCKET", DEBUG, "Can't get peername: %s", strerror(errno));
+
                }
 
                ServerInstance->SE->NonBlocking(incomingSockfd);
 
-               if (ServerInstance->Config->GetIOHook(in_port))
-               {
-                       try
-                       {
-                               ServerInstance->Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, buf, in_port);
-                       }
-                       catch (CoreException& modexcept)
-                       {
-                               ServerInstance->Logs->Log("SOCKET", DEBUG,"%s threw an exception: %s", modexcept.GetSource(), modexcept.GetReason());
-                       }
-               }
                ServerInstance->stats->statsAccept++;
-               ServerInstance->Users->AddClient(ServerInstance, incomingSockfd, in_port, false, this->family, client);
+               ServerInstance->Users->AddClient(ServerInstance, incomingSockfd, in_port, false, this->family, client, target);
        }
        else
        {