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

diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index dee0a9d48..2b079c6ff 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -32,6 +32,7 @@ class ModuleHttpServer;
 
 static ModuleHttpServer* HttpModule;
 static bool claimed;
+static std::set<HttpServerSocket*> sockets;
 
 /** HTTP socket states
  */
@@ -58,9 +59,11 @@ class HttpServerSocket : public BufferedSocket
 	std::string http_version;
 
  public:
+	const time_t createtime;
 
 	HttpServerSocket(int newfd, const std::string& IP, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server)
 		: BufferedSocket(newfd), ip(IP), postsize(0)
+		, createtime(ServerInstance->Time())
 	{
 		InternalState = HTTP_SERVE_WAIT_REQUEST;
 
@@ -69,6 +72,11 @@ class HttpServerSocket : public BufferedSocket
 			GetIOHook()->OnStreamSocketAccept(this, client, server);
 	}
 
+	~HttpServerSocket()
+	{
+		sockets.erase(this);
+	}
+
 	virtual void OnError(BufferedSocketError)
 	{
 		ServerInstance->GlobalCulls.AddItem(this);
@@ -99,7 +107,7 @@ class HttpServerSocket : public BufferedSocket
 			case 300:
 				return "MULTIPLE CHOICES";
 			case 301:
-				return "MOVED PERMENANTLY";
+				return "MOVED PERMANENTLY";
 			case 302:
 				return "FOUND";
 			case 303:
@@ -186,7 +194,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)
@@ -333,13 +341,22 @@ class HttpServerSocket : public BufferedSocket
 
 class ModuleHttpServer : public Module
 {
-	std::vector<HttpServerSocket *> httpsocks;
+	unsigned int timeoutsec;
+
  public:
 
 	void init()
 	{
 		HttpModule = this;
-		ServerInstance->Modules->Attach(I_OnAcceptConnection, this);
+		Implementation eventlist[] = { I_OnAcceptConnection, I_OnBackgroundTimer, I_OnRehash, I_OnUnloadModule };
+		ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
+		OnRehash(NULL);
+	}
+
+	void OnRehash(User* user)
+	{
+		ConfigTag* tag = ServerInstance->Config->ConfValue("httpd");
+		timeoutsec = tag->getInt("timeout");
 	}
 
 	void OnRequest(Request& request)
@@ -358,18 +375,53 @@ class ModuleHttpServer : public Module
 		int port;
 		std::string incomingip;
 		irc::sockets::satoap(*client, incomingip, port);
-		new HttpServerSocket(nfd, incomingip, from, client, server);
+		sockets.insert(new HttpServerSocket(nfd, incomingip, from, client, server));
 		return MOD_RES_ALLOW;
 	}
 
+	void OnBackgroundTimer(time_t curtime)
+	{
+		if (!timeoutsec)
+			return;
+
+		time_t oldest_allowed = curtime - timeoutsec;
+		for (std::set<HttpServerSocket*>::const_iterator i = sockets.begin(); i != sockets.end(); )
+		{
+			HttpServerSocket* sock = *i;
+			++i;
+			if (sock->createtime < oldest_allowed)
+			{
+				sock->cull();
+				delete sock;
+			}
+		}
+	}
+
+	void OnUnloadModule(Module* mod)
+	{
+		for (std::set<HttpServerSocket*>::const_iterator i = sockets.begin(); i != sockets.end(); )
+		{
+			HttpServerSocket* sock = *i;
+			++i;
+			if (sock->GetIOHook() == mod)
+			{
+				sock->cull();
+				delete sock;
+			}
+		}
+	}
 
-	virtual ~ModuleHttpServer()
+	CullResult cull()
 	{
-		for (size_t i = 0; i < httpsocks.size(); i++)
+		std::set<HttpServerSocket*> local;
+		local.swap(sockets);
+		for (std::set<HttpServerSocket*>::const_iterator i = local.begin(); i != local.end(); ++i)
 		{
-			httpsocks[i]->cull();
-			delete httpsocks[i];
+			HttpServerSocket* sock = *i;
+			sock->cull();
+			delete sock;
 		}
+		return Module::cull();
 	}
 
 	virtual Version GetVersion()