From 7ac816f78c8ae39776e100df74b253dac70bf760 Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Mon, 3 Nov 2014 15:34:20 +0100 Subject: m_httpd Always timeout connections, set default timeout to 10 seconds --- src/modules/m_httpd.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/modules') diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index bf372f34f..98dfcc387 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -366,7 +366,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,9 +382,6 @@ class ModuleHttpServer : public Module void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE { - if (!timeoutsec) - return; - time_t oldest_allowed = curtime - timeoutsec; for (std::set::const_iterator i = sockets.begin(); i != sockets.end(); ) { -- cgit v1.2.3 From 2f627235c3e115353dbe5484a1d93126c2e6175b Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Mon, 3 Nov 2014 15:34:58 +0100 Subject: m_httpd Remove unused container --- src/modules/m_httpd.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/modules') diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index 98dfcc387..a54f190eb 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -348,7 +348,6 @@ class HTTPdAPIImpl : public HTTPdAPIBase class ModuleHttpServer : public Module { - std::vector httpsocks; HTTPdAPIImpl APIImpl; unsigned int timeoutsec; -- cgit v1.2.3 From 22963e585e20364f86bd41bcd6d99baaf56cc1fc Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Mon, 3 Nov 2014 15:36:10 +0100 Subject: m_httpd Clean up HttpServerSocket constructor --- src/modules/m_httpd.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/modules') diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index a54f190eb..b81b14f8d 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -60,11 +60,12 @@ class HttpServerSocket : public BufferedSocket 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) + : BufferedSocket(newfd) + , InternalState(HTTP_SERVE_WAIT_REQUEST) + , ip(IP) + , postsize(0) , createtime(ServerInstance->Time()) { - InternalState = HTTP_SERVE_WAIT_REQUEST; - if (via->iohookprov) via->iohookprov->OnAccept(this, client, server); } -- cgit v1.2.3 From f3d80041f68417cc10d8e7575659468b30009f22 Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Mon, 3 Nov 2014 15:42:08 +0100 Subject: m_flashpolicyd, m_httpd Handle timeouts using the Timer system --- src/modules/m_flashpolicyd.cpp | 38 ++++++++++++++-------------- src/modules/m_httpd.cpp | 57 ++++++++++++++++++++++-------------------- 2 files changed, 49 insertions(+), 46 deletions(-) (limited to 'src/modules') diff --git a/src/modules/m_flashpolicyd.cpp b/src/modules/m_flashpolicyd.cpp index 46fd33e61..6466a9fb2 100644 --- a/src/modules/m_flashpolicyd.cpp +++ b/src/modules/m_flashpolicyd.cpp @@ -28,15 +28,25 @@ namespace const std::string expected_request("\0", 23); } -class FlashPDSocket : public BufferedSocket +class FlashPDSocket : public BufferedSocket, public Timer { - public: - time_t created; + /** True if this object is in the cull list + */ + bool waitingcull; - FlashPDSocket(int newfd) + bool Tick(time_t currtime) CXX11_OVERRIDE + { + AddToCull(); + return false; + } + + public: + FlashPDSocket(int newfd, unsigned int timeoutsec) : BufferedSocket(newfd) - , created(ServerInstance->Time()) + , Timer(timeoutsec) + , waitingcull(false) { + ServerInstance->Timers.AddTimer(this); } ~FlashPDSocket() @@ -58,10 +68,10 @@ class FlashPDSocket : public BufferedSocket void AddToCull() { - if (created == 0) + if (waitingcull) return; - created = 0; + waitingcull = true; Close(); ServerInstance->GlobalCulls.AddItem(this); } @@ -69,19 +79,9 @@ class FlashPDSocket : public BufferedSocket class ModuleFlashPD : public Module { - time_t timeout; + unsigned int timeout; public: - void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE - { - for (std::set::const_iterator i = sockets.begin(); i != sockets.end(); ++i) - { - FlashPDSocket* sock = *i; - if ((sock->created + timeout <= curtime) && (sock->created != 0)) - sock->AddToCull(); - } - } - ModResult OnAcceptConnection(int nfd, ListenSocket* from, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server) CXX11_OVERRIDE { if (from->bind_tag->getString("type") != "flashpolicyd") @@ -90,7 +90,7 @@ class ModuleFlashPD : public Module if (policy_reply.empty()) return MOD_RES_DENY; - sockets.insert(new FlashPDSocket(nfd)); + sockets.insert(new FlashPDSocket(nfd, timeout)); return MOD_RES_ALLOW; } diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index b81b14f8d..30612f644 100644 --- a/src/modules/m_httpd.cpp +++ b/src/modules/m_httpd.cpp @@ -43,7 +43,7 @@ enum HttpState /** A socket used for HTTP transport */ -class HttpServerSocket : public BufferedSocket +class HttpServerSocket : public BufferedSocket, public Timer { HttpState InternalState; std::string ip; @@ -56,16 +56,27 @@ 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) + 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) - , createtime(ServerInstance->Time()) + , waitingcull(false) { + ServerInstance->Timers.AddTimer(this); + if (via->iohookprov) via->iohookprov->OnAccept(this, client, server); } @@ -77,7 +88,7 @@ class HttpServerSocket : public BufferedSocket void OnError(BufferedSocketError) CXX11_OVERRIDE { - ServerInstance->GlobalCulls.AddItem(this); + AddToCull(); } std::string Response(int response) @@ -330,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 @@ -376,34 +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.insert(new HttpServerSocket(nfd, incomingip, from, client, server, timeoutsec)); return MOD_RES_ALLOW; } - void OnBackgroundTimer(time_t curtime) CXX11_OVERRIDE - { - time_t oldest_allowed = curtime - timeoutsec; - for (std::set::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 local; - local.swap(sockets); - for (std::set::const_iterator i = local.begin(); i != local.end(); ++i) + for (std::set::const_iterator i = sockets.begin(); i != sockets.end(); ++i) { HttpServerSocket* sock = *i; - sock->cull(); - delete sock; + sock->AddToCull(); } return Module::cull(); } -- cgit v1.2.3 From ce3ce6cd49e14f640a1cabfef9cf21a239dd961d Mon Sep 17 00:00:00 2001 From: Attila Molnar Date: Mon, 3 Nov 2014 15:43:49 +0100 Subject: m_flashpolicyd, m_httpd Store sockets in a intrusive list --- src/modules/m_flashpolicyd.cpp | 8 ++++---- src/modules/m_httpd.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/modules') diff --git a/src/modules/m_flashpolicyd.cpp b/src/modules/m_flashpolicyd.cpp index 6466a9fb2..8f847e111 100644 --- a/src/modules/m_flashpolicyd.cpp +++ b/src/modules/m_flashpolicyd.cpp @@ -23,12 +23,12 @@ class FlashPDSocket; namespace { - std::set sockets; + insp::intrusive_list sockets; std::string policy_reply; const std::string expected_request("\0", 23); } -class FlashPDSocket : public BufferedSocket, public Timer +class FlashPDSocket : public BufferedSocket, public Timer, public insp::intrusive_list_node { /** True if this object is in the cull list */ @@ -90,7 +90,7 @@ class ModuleFlashPD : public Module if (policy_reply.empty()) return MOD_RES_DENY; - sockets.insert(new FlashPDSocket(nfd, timeout)); + sockets.push_front(new FlashPDSocket(nfd, timeout)); return MOD_RES_ALLOW; } @@ -148,7 +148,7 @@ class ModuleFlashPD : public Module CullResult cull() { - for (std::set::const_iterator i = sockets.begin(); i != sockets.end(); ++i) + for (insp::intrusive_list::const_iterator i = sockets.begin(); i != sockets.end(); ++i) { FlashPDSocket* sock = *i; sock->AddToCull(); diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp index 30612f644..a4452c9c0 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 sockets; +static insp::intrusive_list sockets; /** HTTP socket states */ @@ -43,7 +43,7 @@ enum HttpState /** A socket used for HTTP transport */ -class HttpServerSocket : public BufferedSocket, public Timer +class HttpServerSocket : public BufferedSocket, public Timer, public insp::intrusive_list_node { HttpState InternalState; std::string ip; @@ -397,13 +397,13 @@ class ModuleHttpServer : public Module int port; std::string incomingip; irc::sockets::satoap(*client, incomingip, port); - sockets.insert(new HttpServerSocket(nfd, incomingip, from, client, server, timeoutsec)); + sockets.push_front(new HttpServerSocket(nfd, incomingip, from, client, server, timeoutsec)); return MOD_RES_ALLOW; } CullResult cull() CXX11_OVERRIDE { - for (std::set::const_iterator i = sockets.begin(); i != sockets.end(); ++i) + for (insp::intrusive_list::const_iterator i = sockets.begin(); i != sockets.end(); ++i) { HttpServerSocket* sock = *i; sock->AddToCull(); -- cgit v1.2.3