X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd.cpp;h=b1dc7b6101ee93cc964a5aa534459207b0b2e469;hb=d54fd9b1e6b31f69332a9241b5f17330c0ad61e0;hp=ae3611024eb32cc39daeb1261f0ce7bce41c77a1;hpb=b37a253d962ed7af1ea7a328abf2a1af74f30759;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index ae3611024..b1dc7b610 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -21,7 +21,7 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 #include "inspsocket.h"
-#include "helperfuncs.h"
+
 #include "inspircd.h"
 #include "httpd.h"
 
@@ -29,11 +29,9 @@ using namespace std;
 
 class ModuleHttp;
 
-extern InspIRCd* ServerInstance;
 
-static Server *Srv;
+
 static ModuleHttp* HttpModule;
-extern time_t TIME;
 static bool claimed;
 
 enum HttpState
@@ -53,7 +51,7 @@ class HttpSocket : public InspSocket
 
 	HttpSocket(InspIRCd* SI, std::string host, int port, bool listening, unsigned long maxtime, FileReader* index_page) : InspSocket(SI, host, port, listening, maxtime), index(index_page)
 	{
-		log(DEBUG,"HttpSocket constructor");
+		SI->Log(DEBUG,"HttpSocket constructor");
 		InternalState = HTTP_LISTEN;
 	}
 
@@ -67,7 +65,7 @@ class HttpSocket : public InspSocket
 		if (InternalState == HTTP_LISTEN)
 		{
 			HttpSocket* s = new HttpSocket(this->Instance, newsock, ip, index);
-			Srv->AddSocket(s);
+			s = s; /* Stop GCC whining */
 		}
 		return true;
 	}
@@ -169,7 +167,8 @@ class HttpSocket : public InspSocket
 
 	void SendHeaders(unsigned long size, int response, const std::string &extraheaders)
 	{
-		struct tm *timeinfo = localtime(&TIME);
+		time_t local = this->Instance->Time();
+		struct tm *timeinfo = localtime(&local);
 		this->Write("HTTP/1.1 "+ConvToStr(response)+" "+Response(response)+"\r\nDate: ");
 		this->Write(asctime(timeinfo));
 		if (extraheaders.empty())
@@ -221,12 +220,12 @@ class HttpSocket : public InspSocket
 						claimed = false;
 						HTTPRequest httpr(request_type,uri,&headers,this,this->GetIP());
 						Event e((char*)&httpr, (Module*)HttpModule, "httpd_url");
-						e.Send();
+						e.Send(this->Instance);
 
 						if (!claimed)
 						{
 							SendHeaders(0, 404, "");
-							log(DEBUG,"Page not claimed, 404");
+							Instance->Log(DEBUG,"Page not claimed, 404");
 						}
 					}
 				}
@@ -246,7 +245,7 @@ class HttpSocket : public InspSocket
 
 	void Page(std::stringstream* n, int response, std::string& extraheaders)
 	{
-		log(DEBUG,"Sending page");
+		Instance->Log(DEBUG,"Sending page");
 		SendHeaders(n->str().length(), response, extraheaders);
 		this->Write(n->str());
 	}
@@ -259,7 +258,7 @@ class ModuleHttp : public Module
 	std::string bindip;
 	std::string indexfile;
 
-	FileReader index;
+	FileReader* index;
 
 	HttpSocket* http;
 
@@ -267,27 +266,28 @@ class ModuleHttp : public Module
 
 	void ReadConfig()
 	{
-		ConfigReader c;
+		ConfigReader c(ServerInstance);
 		this->host = c.ReadValue("http", "host", 0);
 		this->bindip = c.ReadValue("http", "ip", 0);
 		this->port = c.ReadInteger("http", "port", 0, true);
 		this->indexfile = c.ReadValue("http", "index", 0);
 
-		index.LoadFile(this->indexfile);
+		if (index)
+		{
+			delete index;
+			index = NULL;
+		}
+		index = new FileReader(ServerInstance, this->indexfile);
 	}
 
 	void CreateListener()
 	{
-		http = new HttpSocket(ServerInstance, this->bindip, this->port, true, 0, &index);
-		if ((http) && (http->GetState() == I_LISTENING))
-		{
-			Srv->AddSocket(http);
-		}
+		http = new HttpSocket(ServerInstance, this->bindip, this->port, true, 0, index);
 	}
 
 	ModuleHttp(InspIRCd* Me) : Module::Module(Me)
 	{
-		
+		index = NULL;
 		ReadConfig();
 		CreateListener();
 	}
@@ -298,7 +298,7 @@ class ModuleHttp : public Module
 
 	char* OnRequest(Request* request)
 	{
-		log(DEBUG,"Got HTTPDocument object");
+		ServerInstance->Log(DEBUG,"Got HTTPDocument object");
 		claimed = true;
 		HTTPDocument* doc = (HTTPDocument*)request->GetData();
 		HttpSocket* sock = (HttpSocket*)doc->sock;
@@ -313,7 +313,7 @@ class ModuleHttp : public Module
 
 	virtual ~ModuleHttp()
 	{
-		Srv->DelSocket(http);
+		ServerInstance->SE->DelFd(http);
 	}
 
 	virtual Version GetVersion()