Remove uneccessary socket includes now included in socket.h

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

diff --git a/src/timer.cpp b/src/timer.cpp
index b804920e523fe057b2632e976354bcac067e0179..56cda27b2b4fbad4c28545fe88d8666849b77035 100644 (file)
--- a/src/timer.cpp
+++ b/src/timer.cpp
@@ -17,19 +17,15 @@
 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 <time.h>
+#include <vector>
+#include <map>
+#include "users.h"
+#include "ctables.h"
+#include "typedefs.h"
+#include "commands.h"
+#include "globals.h"
+#include "hashcomp.h"
 #include "inspircd.h"
 #include "inspircd_io.h"
 #include "inspstring.h"
@@ -55,7 +51,7 @@ 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;
                }
@@ -65,6 +61,35 @@ void TickTimers(time_t TIME)
        }
 }
 
+/*
+ * 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 TickMissedTimers(time_t TIME)
+{
+       for (time_t n = TIME-1; n > TIME-120; n--)
+       {
+               timerlist::iterator found = Timers.find(n);
+               if (found != Timers.end())
+               {
+                       timergroup* x = found->second;
+                       for (timergroup::iterator y = x->begin(); y != x->end(); y++)
+                       {
+                               InspTimer* z = *y;
+                               z->Tick(TIME);
+                               delete z;
+                       }
+
+                       Timers.erase(found);
+                       delete x;
+               }
+       }
+}
+
 void AddTimer(InspTimer* T)
 {
        timergroup* x = NULL;