m_spanningtree Remove remains of the KeepNickTS workaround

[user/henk/code/inspircd.git] / src / modules / m_httpd.cpp

diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index a853e12c2f95ecde967375b17145f160f27f3eff..d0291b8cc0f98c251db1cec7ac0f16ebcaa05358 100644 (file)
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -23,10 +23,8 @@
 
 
 #include "inspircd.h"
-#include "httpd.h"
-
-/* $ModDesc: Provides HTTP serving facilities to modules */
-/* $ModDep: httpd.h */
+#include "iohook.h"
+#include "modules/httpd.h"
 
 class ModuleHttpServer;
 
@@ -67,9 +65,8 @@ class HttpServerSocket : public BufferedSocket
        {
                InternalState = HTTP_SERVE_WAIT_REQUEST;
 
-               FOREACH_MOD(I_OnHookIO, OnHookIO(this, via));
-               if (GetIOHook())
-                       GetIOHook()->OnStreamSocketAccept(this, client, server);
+               if (via->iohookprov)
+                       via->iohookprov->OnAccept(this, client, server);
        }
 
        ~HttpServerSocket()
@@ -77,7 +74,7 @@ class HttpServerSocket : public BufferedSocket
                sockets.erase(this);
        }
 
-       virtual void OnError(BufferedSocketError)
+       void OnError(BufferedSocketError) CXX11_OVERRIDE
        {
                ServerInstance->GlobalCulls.AddItem(this);
        }
@@ -225,7 +222,7 @@ class HttpServerSocket : public BufferedSocket
 
                        if (reqbuffer.length() >= 8192)
                        {
-                               ServerInstance->Logs->Log("m_httpd",DEBUG, "m_httpd dropped connection due to an oversized request buffer");
+                               ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "m_httpd dropped connection due to an oversized request buffer");
                                reqbuffer.clear();
                                SetError("Buffer");
                        }
@@ -339,36 +336,45 @@ class HttpServerSocket : public BufferedSocket
        }
 };
 
+class HTTPdAPIImpl : public HTTPdAPIBase
+{
+ public:
+       HTTPdAPIImpl(Module* parent)
+               : HTTPdAPIBase(parent)
+       {
+       }
+
+       void SendResponse(HTTPDocumentResponse& resp) CXX11_OVERRIDE
+       {
+               claimed = true;
+               resp.src.sock->Page(resp.document, resp.responsecode, &resp.headers);
+       }
+};
+
 class ModuleHttpServer : public Module
 {
+       std::vector<HttpServerSocket *> httpsocks;
+       HTTPdAPIImpl APIImpl;
        unsigned int timeoutsec;
 
  public:
+       ModuleHttpServer()
+               : APIImpl(this)
+       {
+       }
 
-       void init()
+       void init() CXX11_OVERRIDE
        {
                HttpModule = this;
-               Implementation eventlist[] = { I_OnAcceptConnection, I_OnBackgroundTimer, I_OnRehash };
-               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
-               OnRehash(NULL);
        }
 
-       void OnRehash(User* user)
+       void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
                ConfigTag* tag = ServerInstance->Config->ConfValue("httpd");
                timeoutsec = tag->getInt("timeout");
        }
 
-       void OnRequest(Request& request)
-       {
-               if (strcmp(request.id, "HTTP-DOC") != 0)
-                       return;
-               HTTPDocumentResponse& resp = static_cast<HTTPDocumentResponse&>(request);
-               claimed = true;
-               resp.src.sock->Page(resp.document, resp.responsecode, &resp.headers);
-       }
-
-       ModResult OnAcceptConnection(int nfd, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
+       ModResult OnAcceptConnection(int nfd, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE
        {
                if (from->bind_tag->getString("type") != "httpd")
                        return MOD_RES_PASSTHRU;
@@ -379,7 +385,7 @@ class ModuleHttpServer : public Module
                return MOD_RES_ALLOW;
        }
 
-       void OnBackgroundTimer(time_t curtime)
+       void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE
        {
                if (!timeoutsec)
                        return;
@@ -397,7 +403,7 @@ class ModuleHttpServer : public Module
                }
        }
 
-       CullResult cull()
+       CullResult cull() CXX11_OVERRIDE
        {
                std::set<HttpServerSocket*> local;
                local.swap(sockets);
@@ -410,7 +416,7 @@ class ModuleHttpServer : public Module
                return Module::cull();
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides HTTP serving facilities to modules", VF_VENDOR);
        }