Merge branch 'master+websocket'

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

diff --git a/src/listensocket.cpp b/src/listensocket.cpp
index cb4bfd2db4a01bd06fa6f177bce17e4b8e4e2ef3..fb9f2a0eff6e313ef01caced913462fa1033d6e1 100644 (file)
--- a/src/listensocket.cpp
+++ b/src/listensocket.cpp
@@ -19,8 +19,7 @@
 
 
 #include "inspircd.h"
-#include "socket.h"
-#include "socketengine.h"
+#include "iohook.h"
 
 #ifndef _WIN32
 #include <netinet/tcp.h>
@@ -28,7 +27,6 @@
 
 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 = bind_to.str();
@@ -102,8 +100,7 @@ ListenSocket::~ListenSocket()
        }
 }
 
-/* Just seperated into another func for tidiness really.. */
-void ListenSocket::AcceptInternal()
+void ListenSocket::OnEventHandlerRead()
 {
        irc::sockets::sockaddrs client;
        irc::sockets::sockaddrs server;
@@ -111,10 +108,10 @@ void ListenSocket::AcceptInternal()
        socklen_t length = sizeof(client);
        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);
+       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Accepting connection on socket %s fd %d", bind_desc.c_str(), incomingSockfd);
        if (incomingSockfd < 0)
        {
-               ServerInstance->stats->statsRefused++;
+               ServerInstance->stats.Refused++;
                return;
        }
 
@@ -170,42 +167,34 @@ void ListenSocket::AcceptInternal()
        }
        if (res == MOD_RES_ALLOW)
        {
-               ServerInstance->stats->statsAccept++;
+               ServerInstance->stats.Accept++;
        }
        else
        {
-               ServerInstance->stats->statsRefused++;
+               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");
                SocketEngine::Close(incomingSockfd);
        }
 }
 
-void ListenSocket::HandleEvent(EventType e, int err)
+void ListenSocket::ResetIOHookProvider()
 {
-       switch (e)
+       iohookprovs[0].SetProvider(bind_tag->getString("hook"));
+
+       // Check that all non-last hooks support being in the middle
+       for (IOHookProvList::iterator i = iohookprovs.begin(); i != iohookprovs.end()-1; ++i)
        {
-               case EVENT_ERROR:
-                       ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "ListenSocket::HandleEvent() received a socket engine error event! well shit! '%s'", strerror(err));
-                       break;
-               case EVENT_WRITE:
-                       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "*** BUG *** ListenSocket::HandleEvent() got a WRITE event!!!");
-                       break;
-               case EVENT_READ:
-                       this->AcceptInternal();
-                       break;
+               IOHookProvRef& curr = *i;
+               // Ignore if cannot be in the middle
+               if ((curr) && (!curr->IsMiddle()))
+                       curr.SetProvider(std::string());
        }
-}
 
-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);
+       // SSL should be the last
+       iohookprovs.back().SetProvider(provname);
 }