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

diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index 7d670ea2b..b1dc7b610 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -21,16 +21,17 @@ using namespace std;
 #include "channels.h"
 #include "modules.h"
 #include "inspsocket.h"
-#include "helperfuncs.h"
+
+#include "inspircd.h"
 #include "httpd.h"
 
 /* $ModDesc: Provides HTTP serving facilities to modules */
 
 class ModuleHttp;
 
-static Server *Srv;
+
+
 static ModuleHttp* HttpModule;
-extern time_t TIME;
 static bool claimed;
 
 enum HttpState
@@ -48,13 +49,13 @@ class HttpSocket : public InspSocket
 
  public:
 
-	HttpSocket(std::string host, int port, bool listening, unsigned long maxtime, FileReader* index_page) : InspSocket(host, port, listening, maxtime), index(index_page)
+	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;
 	}
 
-	HttpSocket(int newfd, char* ip, FileReader* ind) : InspSocket(newfd, ip), index(ind)
+	HttpSocket(InspIRCd* SI, int newfd, char* ip, FileReader* ind) : InspSocket(SI, newfd, ip), index(ind)
 	{
 		InternalState = HTTP_SERVE_WAIT_REQUEST;
 	}
@@ -63,8 +64,8 @@ class HttpSocket : public InspSocket
 	{
 		if (InternalState == HTTP_LISTEN)
 		{
-			HttpSocket* s = new HttpSocket(newsock, ip, index);
-			Srv->AddSocket(s);
+			HttpSocket* s = new HttpSocket(this->Instance, newsock, ip, index);
+			s = s; /* Stop GCC whining */
 		}
 		return true;
 	}
@@ -164,13 +165,22 @@ class HttpSocket : public InspSocket
 		}
 	}
 
-	void SendHeaders(unsigned long size, int response)
+	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())
+		{
+			this->Write("Content-Type: text/html\r\n");
+		}
+		else
+		{
+			this->Write(extraheaders);
+		}
 		this->Write("Server: InspIRCd/m_httpd.so/1.1\r\nContent-Length: "+ConvToStr(size)+
-				"\r\nConnection: close\r\nContent-Type: text/html\r\n\r\n");
+				"\r\nConnection: close\r\n\r\n");
 	}
 
 	virtual bool OnDataReady()
@@ -196,13 +206,13 @@ class HttpSocket : public InspSocket
 
 				if ((http_version != "HTTP/1.1") && (http_version != "HTTP/1.0"))
 				{
-					SendHeaders(0, 505);
+					SendHeaders(0, 505, "");
 				}
 				else
 				{
 					if ((request_type == "GET") && (uri == "/"))
 					{
-						SendHeaders(index->ContentSize(),200);
+						SendHeaders(index->ContentSize(), 200, "");
 						this->Write(index->Contents());
 					}
 					else
@@ -210,10 +220,13 @@ 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);
+						{
+							SendHeaders(0, 404, "");
+							Instance->Log(DEBUG,"Page not claimed, 404");
+						}
 					}
 				}
 
@@ -230,9 +243,10 @@ class HttpSocket : public InspSocket
 		}
 	}
 
-	void Page(std::stringstream* n, int response)
+	void Page(std::stringstream* n, int response, std::string& extraheaders)
 	{
-		SendHeaders(n->str().length(),response);
+		Instance->Log(DEBUG,"Sending page");
+		SendHeaders(n->str().length(), response, extraheaders);
 		this->Write(n->str());
 	}
 };
@@ -244,7 +258,7 @@ class ModuleHttp : public Module
 	std::string bindip;
 	std::string indexfile;
 
-	FileReader index;
+	FileReader* index;
 
 	HttpSocket* http;
 
@@ -252,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(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(Server* Me) : Module::Module(Me)
+	ModuleHttp(InspIRCd* Me) : Module::Module(Me)
 	{
-		Srv = Me;
+		index = NULL;
 		ReadConfig();
 		CreateListener();
 	}
@@ -283,10 +298,11 @@ class ModuleHttp : public Module
 
 	char* OnRequest(Request* request)
 	{
+		ServerInstance->Log(DEBUG,"Got HTTPDocument object");
 		claimed = true;
 		HTTPDocument* doc = (HTTPDocument*)request->GetData();
 		HttpSocket* sock = (HttpSocket*)doc->sock;
-		sock->Page(doc->GetDocument(), doc->GetResponseCode());
+		sock->Page(doc->GetDocument(), doc->GetResponseCode(), doc->GetExtraHeaders());
 		return NULL;
 	}
 
@@ -297,12 +313,12 @@ class ModuleHttp : public Module
 
 	virtual ~ModuleHttp()
 	{
-		Srv->DelSocket(http);
+		ServerInstance->SE->DelFd(http);
 	}
 
 	virtual Version GetVersion()
 	{
-		return Version(1,0,0,0,VF_STATIC|VF_VENDOR);
+		return Version(1,0,0,0,VF_STATIC|VF_VENDOR|VF_SERVICEPROVIDER);
 	}
 };
 
@@ -318,7 +334,7 @@ class ModuleHttpFactory : public ModuleFactory
 	{
 	}
 	
-	virtual Module * CreateModule(Server* Me)
+	virtual Module * CreateModule(InspIRCd* Me)
 	{
 		HttpModule = new ModuleHttp(Me);
 		return HttpModule;