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 4ce203a94b06315fe8b6e8ca429a2e540533973d..ee30ba4e9e9c7951f469ba22a3227b7a0868f00a 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -135,6 +135,8 @@ std::string InspIRCd::GetRevision()
         * into the same variable twice, the first word
         * is discarded, and the second one returned.
         */
+
+       /* XXX - this revision ID is NOT bumping automatically -- w00t */
        std::stringstream Revision("$Revision$");
        std::string single;
        Revision >> single >> single;
@@ -384,9 +386,9 @@ 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 MODES=" << MAXMODES << " CHANTYPES=# PREFIX=(ohv)@%+ MAP SAFELIST MAXCHANNELS=" << MAXCHANS << " MAXBANS=60 NICKLEN=" << NICKMAX-1;
-       v << " CASEMAPPING=rfc1459 STATUSMSG=@+ CHARSET=ascii TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=" << Config->MaxTargets << " AWAYLEN=";
-       v << MAXAWAY << " CHANMODES=b,k,l,psmnti NETWORK=" << Config->Network;
+       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();
        FOREACH_MOD(I_On005Numeric,On005Numeric(Config->data005));
 }
@@ -490,35 +492,44 @@ bool InspIRCd::LoadModule(const char* filename)
                        snprintf(MODERR,MAXBUF,"Loader/Linker error: %s",factory[MODCOUNT+1]->LastError());
                        return false;
                 }
-                if (factory[MODCOUNT+1]->factory)
-                {
-                       Module* m = factory[MODCOUNT+1]->factory->CreateModule(MyServer);
-                        modules[MODCOUNT+1] = m;
-                        /* save the module and the module's classfactory, if
-                         * this isnt done, random crashes can occur :/ */
-                        Config->module_names.push_back(filename);
-
-                       char* x = &Config->implement_lists[MODCOUNT+1][0];
-                       for(int t = 0; t < 255; t++)
-                               x[t] = 0;
+               try
+               {
+                       if (factory[MODCOUNT+1]->factory)
+                       {
+                               Module* m = factory[MODCOUNT+1]->factory->CreateModule(MyServer);
+                               modules[MODCOUNT+1] = m;
+                               /* save the module and the module's classfactory, if
+                                * this isnt done, random crashes can occur :/ */
+                               Config->module_names.push_back(filename);
+
+                               char* x = &Config->implement_lists[MODCOUNT+1][0];
+                               for(int t = 0; t < 255; t++)
+                                       x[t] = 0;
 
-                       modules[MODCOUNT+1]->Implements(x);
+                               modules[MODCOUNT+1]->Implements(x);
 
-                       for(int t = 0; t < 255; t++)
-                       {
-                               Config->global_implementation[t] += Config->implement_lists[MODCOUNT+1][t];
-                               if (Config->implement_lists[MODCOUNT+1][t])
+                               for(int t = 0; t < 255; t++)
                                {
-                                       log(DEBUG,"Add global implementation: %d %d => %d",MODCOUNT+1,t,Config->global_implementation[t]);
+                                       Config->global_implementation[t] += Config->implement_lists[MODCOUNT+1][t];
+                                       if (Config->implement_lists[MODCOUNT+1][t])
+                                       {
+                                               log(DEBUG,"Add global implementation: %d %d => %d",MODCOUNT+1,t,Config->global_implementation[t]);
+                                       }
                                }
-                       }
-                }
-               else
-                {
-                        log(DEFAULT,"Unable to load %s",modfile);
-                       snprintf(MODERR,MAXBUF,"Factory function failed!");
+                       }
+                       else
+                       {
+                                       log(DEFAULT,"Unable to load %s",modfile);
+                               snprintf(MODERR,MAXBUF,"Factory function failed!");
+                               return false;
+                       }
+               }
+               catch (ModuleException& modexcept)
+               {
+                       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
         }
         else
@@ -626,22 +637,40 @@ 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;
                }
                
                /* Once a second, do the background processing */
                if (TIME != OLDTIME)
+               {
+                       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
+                * the loop. There shouldnt be many module sockets, at
+                * most, 20 or so, so this won't be much of a performance
+                * hit at all.
+                */
+               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,
@@ -729,7 +758,14 @@ int InspIRCd::Run()
                                                NonBlocking(incomingSockfd);
                                                if (Config->GetIOHook(in_port))
                                                {
-                                                       Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, (char*)inet_ntoa(client.sin_addr), in_port);
+                                                       try
+                                                       {
+                                                               Config->GetIOHook(in_port)->OnRawSocketAccept(incomingSockfd, (char*)inet_ntoa(client.sin_addr), in_port);
+                                                       }
+                                                       catch (ModuleException& modexcept)
+                                                       {
+                                                               log(DEBUG,"Module exception cought: %s",modexcept.GetReason()); \
+                                                       }
                                                }
                                                stats->statsAccept++;
                                                AddClient(incomingSockfd, in_port, false, client.sin_addr);