Merge insp20

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

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index 20cbe51ac8d21098182e4b0d8ec85cee990f3433..e73a8f4cee9b9fa89df7c2e082c9a5f4182ea253 100644 (file)
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -22,15 +22,16 @@
 #include "socket.h"
 #include "socketengine.h"
 
-#ifdef USE_TCP_DEFER_ACCEPT
+#ifndef _WIN32
 #include <netinet/tcp.h>
 #endif
 
 ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_to)
        : bind_tag(tag)
+       , iohookprov(NULL, std::string())
 {
        irc::sockets::satoap(bind_to, bind_addr, bind_port);
-       bind_desc = irc::sockets::satouser(bind_to);
+       bind_desc = bind_to.str();
 
        fd = socket(bind_to.sa.sa_family, SOCK_STREAM, 0);
 
@@ -55,17 +56,17 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
        }
 #endif
 
-       ServerInstance->SE->SetReuse(fd);
-       int rv = ServerInstance->SE->Bind(this->fd, bind_to);
+       SocketEngine::SetReuse(fd);
+       int rv = SocketEngine::Bind(this->fd, bind_to);
        if (rv >= 0)
-               rv = ServerInstance->SE->Listen(this->fd, ServerInstance->Config->MaxConn);
+               rv = SocketEngine::Listen(this->fd, ServerInstance->Config->MaxConn);
 
        int timeout = tag->getInt("defer", 0);
        if (timeout && !rv)
        {
-#ifdef USE_TCP_DEFER_ACCEPT
+#if defined TCP_DEFER_ACCEPT
                setsockopt(fd, IPPROTO_TCP, TCP_DEFER_ACCEPT, &timeout, sizeof(timeout));
-#elif defined USE_SO_ACCEPTFILTER
+#elif defined SO_ACCEPTFILTER
                struct accept_filter_arg afa;
                memset(&afa, 0, sizeof(afa));
                strcpy(afa.af_name, "dataready");
@@ -76,15 +77,17 @@ ListenSocket::ListenSocket(ConfigTag* tag, const irc::sockets::sockaddrs& bind_t
        if (rv < 0)
        {
                int errstore = errno;
-               ServerInstance->SE->Shutdown(this, 2);
-               ServerInstance->SE->Close(this);
+               SocketEngine::Shutdown(this, 2);
+               SocketEngine::Close(this->GetFd());
                this->fd = -1;
                errno = errstore;
        }
        else
        {
-               ServerInstance->SE->NonBlocking(this->fd);
-               ServerInstance->SE->AddFd(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
+               SocketEngine::NonBlocking(this->fd);
+               SocketEngine::AddFd(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE);
+
+               this->ResetIOHookProvider();
        }
 }
 
@@ -92,12 +95,10 @@ ListenSocket::~ListenSocket()
 {
        if (this->GetFd() > -1)
        {
-               ServerInstance->SE->DelFd(this);
                ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Shut down listener on fd %d", this->fd);
-               ServerInstance->SE->Shutdown(this, 2);
-               if (ServerInstance->SE->Close(this) != 0)
+               SocketEngine::Shutdown(this, 2);
+               if (SocketEngine::Close(this) != 0)
                        ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Failed to cancel listener: %s", strerror(errno));
-               this->fd = -1;
        }
 }
 
@@ -108,7 +109,7 @@ void ListenSocket::AcceptInternal()
        irc::sockets::sockaddrs server;
 
        socklen_t length = sizeof(client);
-       int incomingSockfd = ServerInstance->SE->Accept(this, &client.sa, &length);
+       int incomingSockfd = SocketEngine::Accept(this, &client.sa, &length);
 
        ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "HandleEvent for Listensocket %s nfd=%d", bind_desc.c_str(), incomingSockfd);
        if (incomingSockfd < 0)
@@ -134,11 +135,11 @@ void ListenSocket::AcceptInternal()
         * which for the time being is a physical impossibility (even the largest networks dont have more
         * than about 10,000 users on ONE server!)
         */
-       if (incomingSockfd >= ServerInstance->SE->GetMaxFds())
+       if (incomingSockfd >= SocketEngine::GetMaxFds())
        {
                ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Server is full");
-               ServerInstance->SE->Shutdown(incomingSockfd, 2);
-               ServerInstance->SE->Close(incomingSockfd);
+               SocketEngine::Shutdown(incomingSockfd, 2);
+               SocketEngine::Close(incomingSockfd);
                ServerInstance->stats->statsRefused++;
                return;
        }
@@ -173,7 +174,7 @@ void ListenSocket::AcceptInternal()
                }
        }
 
-       ServerInstance->SE->NonBlocking(incomingSockfd);
+       SocketEngine::NonBlocking(incomingSockfd);
 
        ModResult res;
        FIRST_MOD_RESULT(OnAcceptConnection, res, (incomingSockfd, this, &client, &server));
@@ -195,7 +196,7 @@ void ListenSocket::AcceptInternal()
                ServerInstance->stats->statsRefused++;
                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");
-               ServerInstance->SE->Close(incomingSockfd);
+               SocketEngine::Close(incomingSockfd);
        }
 }
 
@@ -214,3 +215,16 @@ void ListenSocket::HandleEvent(EventType e, int err)
                        break;
        }
 }
+
+bool ListenSocket::ResetIOHookProvider()
+{
+       std::string provname = bind_tag->getString("ssl");
+       if (!provname.empty())
+               provname.insert(0, "ssl/");
+
+       // Set the new provider name, dynref handles the rest
+       iohookprov.SetProvider(provname);
+
+       // Return true if no provider was set, or one was set and it was also found
+       return (provname.empty() || iohookprov);
+}