Decide that it wasn't quite appropriate :(

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 0f4a9488e6821c8d9277a126f89450fe5698a186..ee30ba4e9e9c7951f469ba22a3227b7a0868f00a 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -386,7 +386,7 @@ void InspIRCd::BuildISupport()
 {
         // the neatest way to construct the initial 005 numeric, considering the number of configure constants to go in it...
        std::stringstream v;
-       v << "WALLCHOPS WALLVOICES MODES=" << MAXMODES << " CHANTYPES=# PREFIX=(ohv)@%+ MAP SAFELIST MAXCHANNELS=" << MAXCHANS << " MAXBANS=60 VBANLIST NICKLEN=" << NICKMAX-1;
+       v << "WALLCHOPS WALLVOICES MODES=" << MAXMODES << " CHANTYPES=# PREFIX=(ohv)@%+ MAP MAXCHANNELS=" << MAXCHANS << " MAXBANS=60 VBANLIST NICKLEN=" << NICKMAX-1;
        v << " CASEMAPPING=rfc1459 STATUSMSG=@%+ CHARSET=ascii TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=" << Config->MaxTargets << " AWAYLEN=";
        v << MAXAWAY << " CHANMODES=b,k,l,psmnti FNC NETWORK=" << Config->Network << " MAXPARA=32";
        Config->data005 = v.str();
@@ -528,6 +528,7 @@ bool InspIRCd::LoadModule(const char* filename)
                {
                        log(DEFAULT,"Unable to load %s: ",modfile,modexcept.GetReason());
                        snprintf(MODERR,MAXBUF,"Factory function threw an exception: %s",modexcept.GetReason());
+                       return false;
                }
 #ifndef STATIC_LINK
         }
@@ -636,14 +637,15 @@ int InspIRCd::Run()
                 * timing using this event, so we dont have to
                 * time this exactly).
                 */
-               if (((TIME % 8) == 0) && (!expire_run))
+               if (((TIME % 5) == 0) && (!expire_run))
                {
                        expire_lines();
                        FOREACH_MOD(I_OnBackgroundTimer,OnBackgroundTimer(TIME));
+                       TickMissedTimers(TIME);
                        expire_run = true;
                        continue;
                }
-               else if ((TIME % 8) == 1)
+               else if ((TIME % 5) == 1)
                {
                        expire_run = false;
                }
@@ -654,6 +656,10 @@ int InspIRCd::Run()
                        if (TIME < OLDTIME)
                                WriteOpers("*** \002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %d secs.",abs(OLDTIME-TIME));
                        DoBackgroundUserStuff(TIME);
+
+                       /*
+                        * Trigger all InspTimers that are pending
+                        */
                }
 
                /* Process timeouts on module sockets each time around
@@ -663,6 +669,8 @@ int InspIRCd::Run()
                 */
                DoSocketTimeouts(TIME);
 
+               TickTimers(TIME);
+
                /* Call the socket engine to wait on the active
                 * file descriptors. The socket engine has everything's
                 * descriptors in its list... dns, modules, users,