Fix copying too much data into the remote endpoint field.

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

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index 71364238b4f420bf3806c60141e245fffd1d5408..60ee0b449c0d24ef3c1b1452a78f7c23009aa3e3 100644 (file)
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -108,8 +108,12 @@ ListenSocket::~ListenSocket()
        {
                ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Shut down listener on fd %d", this->fd);
                SocketEngine::Shutdown(this, 2);
+
                if (SocketEngine::Close(this) != 0)
                        ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Failed to cancel listener: %s", strerror(errno));
+
+               if (bind_sa.family() == AF_UNIX && unlink(bind_sa.un.sun_path))
+                       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Failed to unlink UNIX socket: %s", strerror(errno));
        }
 }
 
@@ -163,6 +167,14 @@ void ListenSocket::OnEventHandlerRead()
                        memcpy(&server.in4.sin_addr.s_addr, server.in6.sin6_addr.s6_addr + 12, sizeof(uint32_t));
                }
        }
+       else if (client.family() == AF_UNIX)
+       {
+               // Clients connecting via UNIX sockets don't have paths so give them
+               // the server path as defined in RFC 1459 section 8.1.1.
+               //
+               // strcpy is safe here because sizeof(sockaddr_un.sun_path) is equal on both.
+               strcpy(client.un.sun_path, server.un.sun_path);
+       }
 
        SocketEngine::NonBlocking(incomingSockfd);
 
@@ -171,7 +183,7 @@ void ListenSocket::OnEventHandlerRead()
        if (res == MOD_RES_PASSTHRU)
        {
                std::string type = bind_tag->getString("type", "clients");
-               if (type == "clients")
+               if (stdalgo::string::equalsci(type, "clients"))
                {
                        ServerInstance->Users->AddUser(incomingSockfd, this, &client, &server);
                        res = MOD_RES_ALLOW;