Minor improvements to the codepage module.

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

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index b56e970253533a3de9b421bd6513b66c7601aaba..4805b77176e0f2f36c5d423017c2da713c620139 100644 (file)
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -27,12 +27,18 @@
 
 ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_to)
        : bind_tag(tag)
+       , bind_sa(bind_to)
 {
-       bind_addr = bind_to.addr();
-       bind_port = bind_to.port();
-       bind_desc = bind_to.str();
+       // Are we creating a UNIX socket?
+       if (bind_to.family() == AF_UNIX)
+       {
+               // Is 'replace' enabled?
+               const bool replace = tag->getBool("replace");
+               if (replace && irc::sockets::isunix(bind_to.str()))
+                       unlink(bind_to.str().c_str());
+       }
 
-       fd = socket(bind_to.sa.sa_family, SOCK_STREAM, 0);
+       fd = socket(bind_to.family(), SOCK_STREAM, 0);
 
        if (this->fd == -1)
                return;
@@ -44,7 +50,7 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
         * is "::" or an IPv6 address, disable support so that an IPv4 bind will
         * work on the port (by us or another application).
         */
-       if (bind_to.sa.sa_family == AF_INET6)
+       if (bind_to.family() == AF_INET6)
        {
                std::string addr = tag->getString("address");
                /* This must be >= sizeof(DWORD) on Windows */
@@ -69,6 +75,14 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
 #endif
        }
 
+       if (bind_to.family() == AF_UNIX)
+       {
+               const std::string permissionstr = tag->getString("permissions");
+               unsigned int permissions = strtoul(permissionstr.c_str(), NULL, 8);
+               if (permissions && permissions <= 07777)
+                       chmod(bind_to.str().c_str(), permissions);
+       }
+
        SocketEngine::SetReuse(fd);
        int rv = SocketEngine::Bind(this->fd, bind_to);
        if (rv >= 0)
@@ -111,20 +125,24 @@ 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));
        }
 }
 
 void ListenSocket::OnEventHandlerRead()
 {
        irc::sockets::sockaddrs client;
-       irc::sockets::sockaddrs server;
+       irc::sockets::sockaddrs server(bind_sa);
 
        socklen_t length = sizeof(client);
        int incomingSockfd = SocketEngine::Accept(this, &client.sa, &length);
 
-       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Accepting connection on socket %s fd %d", bind_desc.c_str(), incomingSockfd);
+       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Accepting connection on socket %s fd %d", bind_sa.str().c_str(), incomingSockfd);
        if (incomingSockfd < 0)
        {
                ServerInstance->stats.Refused++;
@@ -135,10 +153,9 @@ void ListenSocket::OnEventHandlerRead()
        if (getsockname(incomingSockfd, &server.sa, &sz))
        {
                ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Can't get peername: %s", strerror(errno));
-               irc::sockets::aptosa(bind_addr, bind_port, server);
        }
 
-       if (client.sa.sa_family == AF_INET6)
+       if (client.family() == AF_INET6)
        {
                /*
                 * This case is the be all and end all patch to catch and nuke 4in6
@@ -167,6 +184,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);
 
@@ -175,7 +200,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;
@@ -189,7 +214,7 @@ void ListenSocket::OnEventHandlerRead()
        {
                ServerInstance->stats.Refused++;
                ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "Refusing connection on %s - %s",
-                       bind_desc.c_str(), res == MOD_RES_DENY ? "Connection refused by module" : "Module for this port not found");
+                       bind_sa.str().c_str(), res == MOD_RES_DENY ? "Connection refused by module" : "Module for this port not found");
                SocketEngine::Close(incomingSockfd);
        }
 }