m_flashpolicyd, m_httpd Handle timeouts using the Timer system

diff --git a/src/modules/m_flashpolicyd.cpp b/src/modules/m_flashpolicyd.cpp
index 46fd33e612e818b91915e01ac907de3407ddc596..6466a9fb2fe1bf0a4b6343303d0bbe2a022a72f7 100644 (file)
--- a/src/modules/m_flashpolicyd.cpp
+++ b/src/modules/m_flashpolicyd.cpp
@@ -28,15 +28,25 @@ namespace
        const std::string expected_request("<policy-file-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<FlashPDSocket*>::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 b81b14f8d2a4fdba6ef5beb70afab1521de03ec6..30612f64493ffa2f420370f748fc2a7c2311a9e3 100644 (file)
--- 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<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 (std::set<HttpServerSocket*>::const_iterator i = sockets.begin(); i != sockets.end(); ++i)
                {
                        HttpServerSocket* sock = *i;
-                       sock->cull();
-                       delete sock;
+                       sock->AddToCull();
                }
                return Module::cull();
        }