X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd.cpp;h=3342ba37d425690fa365649f6d9b36fe47ca033a;hb=dd283acb933c541ce1be6532f8c6f37528b41c51;hp=d6c943828419486d98ab805f7faef43649f6b29a;hpb=3a554ef1e9be9dbcf3de3301a4a6c2938d643bea;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index d6c943828..3342ba37d 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -18,9 +18,9 @@
 
 /* $ModDesc: Provides HTTP serving facilities to modules */
 
-class ModuleHttp;
+class ModuleHttpServer;
 
-static ModuleHttp* HttpModule;
+static ModuleHttpServer* HttpModule;
 static bool claimed;
 
 /** HTTP socket states
@@ -33,23 +33,23 @@ enum HttpState
 	HTTP_SERVE_SEND_DATA = 3
 };
 
-class HttpSocket;
+class HttpServerSocket;
 
 /** This class is used to handle HTTP socket timeouts
  */
-class HTTPTimeout : public InspTimer
+class HttpServerTimeout : public InspTimer
 {
  private:
-	/** HttpSocket we are attached to
+	/** HttpServerSocket we are attached to
 	 */
-	HttpSocket* s;
+	HttpServerSocket* s;
 	/** Socketengine the file descriptor is in
 	 */
 	SocketEngine* SE;
  public:
-	/** Attach timeout to HttpSocket
+	/** Attach timeout to HttpServerSocket
 	 */
-	HTTPTimeout(HttpSocket* sock, SocketEngine* engine);
+	HttpServerTimeout(HttpServerSocket* sock, SocketEngine* engine);
 	/** Handle timer tick
 	 */
 	void Tick(time_t TIME);
@@ -57,7 +57,7 @@ class HTTPTimeout : public InspTimer
 
 /** A socket used for HTTP transport
  */
-class HttpSocket : public InspSocket
+class HttpServerSocket : public InspSocket
 {
 	FileReader* index;
 	HttpState InternalState;
@@ -67,21 +67,20 @@ class HttpSocket : public InspSocket
 	std::string uri;
 	std::string http_version;
 	unsigned int postsize;
-	HTTPTimeout* Timeout;
+	HttpServerTimeout* Timeout;
 
  public:
 
-	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), postsize(0)
+	HttpServerSocket(InspIRCd* SI, std::string host, int port, bool listening, unsigned long maxtime, FileReader* index_page) : InspSocket(SI, host, port, listening, maxtime), index(index_page), postsize(0)
 	{
-		SI->Log(DEBUG,"HttpSocket constructor");
 		InternalState = HTTP_LISTEN;
 		Timeout = NULL;
 	}
 
-	HttpSocket(InspIRCd* SI, int newfd, char* ip, FileReader* ind) : InspSocket(SI, newfd, ip), index(ind), postsize(0)
+	HttpServerSocket(InspIRCd* SI, int newfd, char* ip, FileReader* ind) : InspSocket(SI, newfd, ip), index(ind), postsize(0)
 	{
 		InternalState = HTTP_SERVE_WAIT_REQUEST;
-		Timeout = new HTTPTimeout(this, Instance->SE);
+		Timeout = new HttpServerTimeout(this, Instance->SE);
 		Instance->Timers->AddTimer(Timeout);
 	}
 
@@ -90,11 +89,11 @@ class HttpSocket : public InspSocket
 		return index;
 	}
 
-	~HttpSocket()
+	~HttpServerSocket()
 	{
-		if (Instance->Time() < Timeout->GetTimer())
+		if (Timeout)
 		{
-			if (Timeout)
+			if (Instance->Time() < Timeout->GetTimer())
 				Instance->Timers->DelTimer(Timeout);
 			Timeout = NULL;
 		}
@@ -104,7 +103,7 @@ class HttpSocket : public InspSocket
 	{
 		if (InternalState == HTTP_LISTEN)
 		{
-			HttpSocket* s = new HttpSocket(this->Instance, newsock, ip, index);
+			HttpServerSocket* s = new HttpServerSocket(this->Instance, newsock, ip, index);
 			s = s; /* Stop GCC whining */
 		}
 		return true;
@@ -262,16 +261,14 @@ class HttpSocket : public InspSocket
 					{
 						InternalState = HTTP_SERVE_SEND_DATA;
 						SendHeaders(0, 400, "");
-						Timeout = new HTTPTimeout(this, Instance->SE);
+						Timeout = new HttpServerTimeout(this, Instance->SE);
 						Instance->Timers->AddTimer(Timeout);
 					}
 					else
 					{
-						Instance->Log(DEBUG,"%d bytes to read for POST",postsize);
 						std::string::size_type x = headers.str().find("\r\n\r\n");
 						postdata = headers.str().substr(x+4, headers.str().length());
 						/* Get content length and store */
-						Instance->Log(DEBUG,"Initial postdata: '%s'", postdata.c_str());
 						if (postdata.length() >= postsize)
 							ServeData();
 					}
@@ -325,36 +322,34 @@ class HttpSocket : public InspSocket
 				if (!claimed)
 				{
 					SendHeaders(0, 404, "");
-					Instance->Log(DEBUG,"Page not claimed, 404");
 				}
 			}
 		}
-		Timeout = new HTTPTimeout(this, Instance->SE);
+		Timeout = new HttpServerTimeout(this, Instance->SE);
 		Instance->Timers->AddTimer(Timeout);
 	}
 
 	void Page(std::stringstream* n, int response, std::string& extraheaders)
 	{
-		Instance->Log(DEBUG,"Sending page");
 		SendHeaders(n->str().length(), response, extraheaders);
 		this->Write(n->str());
 	}
 };
 
-HTTPTimeout::HTTPTimeout(HttpSocket* sock, SocketEngine* engine) : InspTimer(60, time(NULL)), s(sock), SE(engine)
+HttpServerTimeout::HttpServerTimeout(HttpServerSocket* sock, SocketEngine* engine) : InspTimer(60, time(NULL)), s(sock), SE(engine)
 {
 }
 
-void HTTPTimeout::Tick(time_t TIME)
+void HttpServerTimeout::Tick(time_t TIME)
 {
 	SE->DelFd(s);
 	s->Close();
 	delete s;
 }
 
-class ModuleHttp : public Module
+class ModuleHttpServer : public Module
 {
-	std::vector<HttpSocket*> httpsocks;
+	std::vector<HttpServerSocket*> httpsocks;
  public:
 
 	void ReadConfig()
@@ -364,7 +359,7 @@ class ModuleHttp : public Module
 		std::string bindip;
 		std::string indexfile;
 		FileReader* index;
-		HttpSocket* http;
+		HttpServerSocket* http;
 		ConfigReader c(ServerInstance);
 
 		httpsocks.clear();
@@ -376,12 +371,14 @@ class ModuleHttp : public Module
 			port = c.ReadInteger("http", "port", i, true);
 			indexfile = c.ReadValue("http", "index", i);
 			index = new FileReader(ServerInstance, indexfile);
-			http = new HttpSocket(ServerInstance, bindip, port, true, 0, index);
+			if (!index->Exists())
+				throw ModuleException("Can't read index file: "+indexfile);
+			http = new HttpServerSocket(ServerInstance, bindip, port, true, 0, index);
 			httpsocks.push_back(http);
 		}
 	}
 
-	ModuleHttp(InspIRCd* Me) : Module::Module(Me)
+	ModuleHttpServer(InspIRCd* Me) : Module::Module(Me)
 	{
 		ReadConfig();
 	}
@@ -392,10 +389,9 @@ 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;
+		HttpServerSocket* sock = (HttpServerSocket*)doc->sock;
 		sock->Page(doc->GetDocument(), doc->GetResponseCode(), doc->GetExtraHeaders());
 		return NULL;
 	}
@@ -405,7 +401,7 @@ class ModuleHttp : public Module
 		List[I_OnEvent] = List[I_OnRequest] = 1;
 	}
 
-	virtual ~ModuleHttp()
+	virtual ~ModuleHttpServer()
 	{
 		for (size_t i = 0; i < httpsocks.size(); i++)
 		{
@@ -422,20 +418,20 @@ class ModuleHttp : public Module
 };
 
 
-class ModuleHttpFactory : public ModuleFactory
+class ModuleHttpServerFactory : public ModuleFactory
 {
  public:
-	ModuleHttpFactory()
+	ModuleHttpServerFactory()
 	{
 	}
 	
-	~ModuleHttpFactory()
+	~ModuleHttpServerFactory()
 	{
 	}
 	
 	virtual Module * CreateModule(InspIRCd* Me)
 	{
-		HttpModule = new ModuleHttp(Me);
+		HttpModule = new ModuleHttpServer(Me);
 		return HttpModule;
 	}
 };
@@ -443,5 +439,5 @@ class ModuleHttpFactory : public ModuleFactory
 
 extern "C" void * init_module( void )
 {
-	return new ModuleHttpFactory;
+	return new ModuleHttpServerFactory;
 }