Add timeouts to the http module. Two seperate timeouts, 60 seconds to receive headers...

[user/henk/code/inspircd.git] / src / timer.cpp

diff --git a/src/timer.cpp b/src/timer.cpp
index c172f2fa5bac2f2c35b38ce6a00c880f8ca79810..bc08ae1d015f1238017bec1b5e76c595aebafea8 100644 (file)
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -14,36 +14,10 @@
  * ---------------------------------------------------
  */
 
-using namespace std;
-
-#include "inspircd_config.h"
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <string>
-#include <unistd.h>
-#include <fcntl.h>
-#include <poll.h>
-#include <sstream>
-#include <iostream>
-#include <fstream>
-#include <stdexcept>
 #include "inspircd.h"
-#include "inspircd_io.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-
-extern InspIRCd* ServerInstance;
-extern ServerConfig* Config;
-extern time_t TIME;
-
-typedef std::vector<InspTimer*> timergroup;
-typedef std::map<time_t, timergroup*> timerlist;
-timerlist Timers;
+#include "timer.h"
 
-void TickTimers(time_t TIME)
+void TimerManager::TickTimers(time_t TIME)
 {
        timerlist::iterator found = Timers.find(TIME);
 
@@ -55,17 +29,47 @@ void TickTimers(time_t TIME)
                 */
                for (timergroup::iterator y = x->begin(); y != x->end(); y++)
                {
-                       InspTimer* n = (InspTimer*)*y;
+                       InspTimer* n = *y;
                        n->Tick(TIME);
-                       delete n;
+                       DELETE(n);
                }
 
                Timers.erase(found);
-               delete x;
+               DELETE(x);
        }
 }
 
-void TickMissedTimers(time_t TIME)
+void TimerManager::DelTimer(InspTimer* T)
+{
+       timerlist::iterator found = Timers.find(T->GetTimer());
+
+       if (found != Timers.end())
+       {
+               timergroup* x = found->second;
+               for (timergroup::iterator y = x->begin(); y != x->end(); y++)
+               {
+                       InspTimer* n = *y;
+                       if (n == T)
+                       {
+                               DELETE(n);
+                               x->erase(y);
+                               if (!x->size())
+                                       Timers.erase(found);
+                               return;
+                       }
+               }
+       }
+}
+
+/*
+ * Because some muppets may do odd things, and their ircd may lock up due
+ * to crappy 3rd party modules, or they may change their system time a bit,
+ * this accounts for shifts of up to 120 secs by looking behind for missed
+ * timers and executing them. This is only executed once every 5 secs.
+ * If you move your clock BACK, and your timers move further ahead as a result,
+ * then tough titty you'll just have to wait.
+ */
+void TimerManager::TickMissedTimers(time_t TIME)
 {
        for (time_t n = TIME-1; n > TIME-120; n--)
        {
@@ -75,18 +79,18 @@ void TickMissedTimers(time_t TIME)
                        timergroup* x = found->second;
                        for (timergroup::iterator y = x->begin(); y != x->end(); y++)
                        {
-                               InspTimer* z = (InspTimer*)*y;
+                               InspTimer* z = *y;
                                z->Tick(TIME);
-                               delete z;
+                               DELETE(z);
                        }
 
                        Timers.erase(found);
-                       delete x;
+                       DELETE(x);
                }
        }
 }
 
-void AddTimer(InspTimer* T)
+void TimerManager::AddTimer(InspTimer* T)
 {
        timergroup* x = NULL;
 
@@ -104,3 +108,4 @@ void AddTimer(InspTimer* T)
 
        x->push_back(T);
 }
+