X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fmodules%2Fm_httpd.cpp;h=bbd9f1275d98f365812009f6d25fcd4918c944d8;hb=9e64fb83aab4f4c0c6964fcdbef4bca0846e930a;hp=735551dffa3ba6dd184a014fa72200b99560d961;hpb=e244cb2c63b1ac1d85bdbb4691f7b1bd940ae804;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index 735551dff..bbd9f1275 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -30,7 +30,7 @@ class ModuleHttpServer;
 
 static ModuleHttpServer* HttpModule;
 static bool claimed;
-static std::set<HttpServerSocket*> sockets;
+static insp::intrusive_list<HttpServerSocket> sockets;
 
 /** HTTP socket states
  */
@@ -43,7 +43,7 @@ enum HttpState
 
 /** A socket used for HTTP transport
  */
-class HttpServerSocket : public BufferedSocket
+class HttpServerSocket : public BufferedSocket, public Timer, public insp::intrusive_list_node<HttpServerSocket>
 {
 	HttpState InternalState;
 	std::string ip;
@@ -56,18 +56,29 @@ class HttpServerSocket : public BufferedSocket
 	std::string uri;
 	std::string http_version;
 
- public:
-	const time_t createtime;
+	/** True if this object is in the cull list
+	 */
+	bool waitingcull;
+
+	bool Tick(time_t currtime) CXX11_OVERRIDE
+	{
+		AddToCull();
+		return false;
+	}
 
-	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())
+ public:
+	HttpServerSocket(int newfd, const std::string& IP, ListenSocket* via, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server, unsigned int timeoutsec)
+		: BufferedSocket(newfd)
+		, Timer(timeoutsec)
+		, InternalState(HTTP_SERVE_WAIT_REQUEST)
+		, ip(IP)
+		, postsize(0)
+		, waitingcull(false)
 	{
-		InternalState = HTTP_SERVE_WAIT_REQUEST;
+		ServerInstance->Timers.AddTimer(this);
 
-		FOREACH_MOD(OnHookIO, (this, via));
-		if (GetIOHook())
-			GetIOHook()->OnStreamSocketAccept(this, client, server);
+		if (via->iohookprov)
+			via->iohookprov->OnAccept(this, client, server);
 	}
 
 	~HttpServerSocket()
@@ -77,7 +88,7 @@ class HttpServerSocket : public BufferedSocket
 
 	void OnError(BufferedSocketError) CXX11_OVERRIDE
 	{
-		ServerInstance->GlobalCulls.AddItem(this);
+		AddToCull();
 	}
 
 	std::string Response(int response)
@@ -105,7 +116,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,13 +197,8 @@ class HttpServerSocket : public BufferedSocket
 
 		WriteData(http_version + " "+ConvToStr(response)+" "+Response(response)+"\r\n");
 
-		time_t local = ServerInstance->Time();
-		struct tm *timeinfo = gmtime(&local);
-		char *date = asctime(timeinfo);
-		date[strlen(date) - 1] = '\0';
-		rheaders.CreateHeader("Date", date);
-
-		rheaders.CreateHeader("Server", BRANCH);
+		rheaders.CreateHeader("Date", InspIRCd::TimeString(ServerInstance->Time(), "%a, %d %b %Y %H:%M:%S GMT", true));
+		rheaders.CreateHeader("Server", INSPIRCD_BRANCH);
 		rheaders.SetHeader("Content-Length", ConvToStr(size));
 
 		if (size)
@@ -263,7 +269,7 @@ class HttpServerSocket : public BufferedSocket
 				continue;
 			}
 
-			std::string cheader = reqbuffer.substr(hbegin, hend - hbegin);
+			std::string cheader(reqbuffer, hbegin, hend - hbegin);
 
 			std::string::size_type fieldsep = cheader.find(':');
 			if ((fieldsep == std::string::npos) || (fieldsep == 0) || (fieldsep == cheader.length() - 1))
@@ -294,7 +300,7 @@ class HttpServerSocket : public BufferedSocket
 
 			if (reqbuffer.length() >= postsize)
 			{
-				postdata = reqbuffer.substr(0, postsize);
+				postdata.assign(reqbuffer, 0, postsize);
 				reqbuffer.erase(0, postsize);
 			}
 			else if (!reqbuffer.empty())
@@ -335,6 +341,16 @@ class HttpServerSocket : public BufferedSocket
 		SendHeaders(n->str().length(), response, *hheaders);
 		WriteData(n->str());
 	}
+
+	void AddToCull()
+	{
+		if (waitingcull)
+			return;
+
+		waitingcull = true;
+		Close();
+		ServerInstance->GlobalCulls.AddItem(this);
+	}
 };
 
 class HTTPdAPIImpl : public HTTPdAPIBase
@@ -354,7 +370,6 @@ class HTTPdAPIImpl : public HTTPdAPIBase
 
 class ModuleHttpServer : public Module
 {
-	std::vector<HttpServerSocket *> httpsocks;
 	HTTPdAPIImpl APIImpl;
 	unsigned int timeoutsec;
 
@@ -372,7 +387,7 @@ class ModuleHttpServer : public Module
 	void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
 	{
 		ConfigTag* tag = ServerInstance->Config->ConfValue("httpd");
-		timeoutsec = tag->getInt("timeout");
+		timeoutsec = tag->getInt("timeout", 10, 1);
 	}
 
 	ModResult OnAcceptConnection(int nfd, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE
@@ -382,37 +397,16 @@ class ModuleHttpServer : public Module
 		int port;
 		std::string incomingip;
 		irc::sockets::satoap(*client, incomingip, port);
-		sockets.insert(new HttpServerSocket(nfd, incomingip, from, client, server));
+		sockets.push_front(new HttpServerSocket(nfd, incomingip, from, client, server, timeoutsec));
 		return MOD_RES_ALLOW;
 	}
 
-	void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE
-	{
-		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;
-			}
-		}
-	}
-
 	CullResult cull() CXX11_OVERRIDE
 	{
-		std::set<HttpServerSocket*> local;
-		local.swap(sockets);
-		for (std::set<HttpServerSocket*>::const_iterator i = local.begin(); i != local.end(); ++i)
+		for (insp::intrusive_list<HttpServerSocket>::const_iterator i = sockets.begin(); i != sockets.end(); ++i)
 		{
 			HttpServerSocket* sock = *i;
-			sock->cull();
-			delete sock;
+			sock->AddToCull();
 		}
 		return Module::cull();
 	}