X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd.cpp;h=7cbef13e255ea2c4a6a3957537d0feebe99d06ac;hb=a85bc774f9c4acbb2dbc1d9ddd02a460c5555391;hp=0584e97c5eea620a46b587ae7291541b78040fc9;hpb=44f42a13de52c8025942ddab42f51feb36821782;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index 0584e97c5..7cbef13e2 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -23,10 +23,11 @@
 
 
 #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;
 
@@ -58,7 +59,6 @@ class HttpServerSocket : public BufferedSocket
 	std::string http_version;
 
  public:
-
 	HttpServerSocket(int newfd, const std::string& IP, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
 		: BufferedSocket(newfd), ip(IP), postsize(0)
 	{
@@ -69,7 +69,7 @@ class HttpServerSocket : public BufferedSocket
 			GetIOHook()->OnStreamSocketAccept(this, client, server);
 	}
 
-	virtual void OnError(BufferedSocketError)
+	void OnError(BufferedSocketError) CXX11_OVERRIDE
 	{
 		ServerInstance->GlobalCulls.AddItem(this);
 	}
@@ -186,7 +186,7 @@ class HttpServerSocket : public BufferedSocket
 		date[strlen(date) - 1] = '\0';
 		rheaders.CreateHeader("Date", date);
 
-		rheaders.CreateHeader("Server", "InspIRCd/m_httpd.so/1.2");
+		rheaders.CreateHeader("Server", BRANCH);
 		rheaders.SetHeader("Content-Length", ConvToStr(size));
 
 		if (size)
@@ -217,7 +217,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("m_httpd", LOG_DEBUG, "m_httpd dropped connection due to an oversized request buffer");
 				reqbuffer.clear();
 				SetError("Buffer");
 			}
@@ -282,7 +282,7 @@ class HttpServerSocket : public BufferedSocket
 			return;
 		}
 
-		if (headers.IsSet("Content-Length") && (postsize = atoi(headers.GetHeader("Content-Length").c_str())) != 0)
+		if (headers.IsSet("Content-Length") && (postsize = ConvToInt(headers.GetHeader("Content-Length"))) > 0)
 		{
 			InternalState = HTTP_SERVE_RECV_POSTDATA;
 
@@ -331,26 +331,40 @@ class HttpServerSocket : public BufferedSocket
 	}
 };
 
-class ModuleHttpServer : public Module
+class HTTPdAPIImpl : public HTTPdAPIBase
 {
-	std::vector<HttpServerSocket *> httpsocks;
  public:
-
-	ModuleHttpServer() 	{
-		HttpModule = this;
-		ServerInstance->Modules->Attach(I_OnAcceptConnection, this);
+	HTTPdAPIImpl(Module* parent)
+		: HTTPdAPIBase(parent)
+	{
 	}
 
-	void OnRequest(Request& request)
+	void SendResponse(HTTPDocumentResponse& resp) 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);
 	}
+};
 
-	ModResult OnAcceptConnection(int nfd, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
+class ModuleHttpServer : public Module
+{
+	std::vector<HttpServerSocket *> httpsocks;
+	HTTPdAPIImpl APIImpl;
+
+ public:
+	ModuleHttpServer()
+		: APIImpl(this)
+	{
+	}
+
+	void init() CXX11_OVERRIDE
+	{
+		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) CXX11_OVERRIDE
 	{
 		if (from->bind_tag->getString("type") != "httpd")
 			return MOD_RES_PASSTHRU;
@@ -361,8 +375,7 @@ class ModuleHttpServer : public Module
 		return MOD_RES_ALLOW;
 	}
 
-
-	virtual ~ModuleHttpServer()
+	~ModuleHttpServer()
 	{
 		for (size_t i = 0; i < httpsocks.size(); i++)
 		{
@@ -371,7 +384,7 @@ class ModuleHttpServer : public Module
 		}
 	}
 
-	virtual Version GetVersion()
+	Version GetVersion() CXX11_OVERRIDE
 	{
 		return Version("Provides HTTP serving facilities to modules", VF_VENDOR);
 	}