Change the syntax of FOREACH macros to be less dumb.

[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 46f0d6907fbdae1aaae3ef84b1c6eafa18a271f3..bb5d5c0b0867111c8d69db22a27f0034e5773a77 100644 (file)
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -23,10 +23,10 @@
 
 
 #include "inspircd.h"
-#include "httpd.h"
+#include "iohook.h"
+#include "modules/httpd.h"
 
-/* $ModDesc: Provides HTTP serving facilities to modules */
-/* $ModDep: httpd.h */
+/* $ModDep: modules/httpd.h */
 
 class ModuleHttpServer;
 
@@ -63,12 +63,12 @@ class HttpServerSocket : public BufferedSocket
        {
                InternalState = HTTP_SERVE_WAIT_REQUEST;
 
-               FOREACH_MOD(I_OnHookIO, OnHookIO(this, via));
+               FOREACH_MOD(OnHookIO, (this, via));
                if (GetIOHook())
                        GetIOHook()->OnStreamSocketAccept(this, client, server);
        }
 
-       virtual void OnError(BufferedSocketError)
+       void OnError(BufferedSocketError) CXX11_OVERRIDE
        {
                ServerInstance->GlobalCulls.AddItem(this);
        }
@@ -216,7 +216,7 @@ class HttpServerSocket : public BufferedSocket
 
                        if (reqbuffer.length() >= 8192)
                        {
-                               ServerInstance->Logs->Log("m_httpd",LOG_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");
                        }
@@ -330,27 +330,40 @@ 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;
 
  public:
-       void init()
+       ModuleHttpServer()
+               : APIImpl(this)
        {
-               HttpModule = this;
-               ServerInstance->Modules->Attach(I_OnAcceptConnection, this);
        }
 
-       void OnRequest(Request& request)
+       void init() CXX11_OVERRIDE
        {
-               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);
+               HttpModule = this;
+               ServerInstance->Modules->AddService(APIImpl);
+               ServerInstance->Modules->Attach(I_OnAcceptConnection, this);
        }
 
-       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;
@@ -361,7 +374,7 @@ class ModuleHttpServer : public Module
                return MOD_RES_ALLOW;
        }
 
-       virtual ~ModuleHttpServer()
+       ~ModuleHttpServer()
        {
                for (size_t i = 0; i < httpsocks.size(); i++)
                {
@@ -370,7 +383,7 @@ class ModuleHttpServer : public Module
                }
        }
 
-       virtual Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("Provides HTTP serving facilities to modules", VF_VENDOR);
        }