]> git.netwichtig.de Git - user/henk/code/inspircd.git/blobdiff - src/inspircd.cpp
Remove /summon and /users (I think 15+ years of being marked deprecated is enough...
[user/henk/code/inspircd.git] / src / inspircd.cpp
index a96e16c45113ec34a815e0ff805acb00feff0bdf..fedc8149f8b896df4f67a2fc5fd63c2bf88732b4 100644 (file)
@@ -585,87 +585,91 @@ void InspIRCd::InitialiseUID()
                current_uid[i] = 'A';
 }
 
-void InspIRCd::DoOneIteration(bool process_module_sockets)
+int InspIRCd::Run()
 {
+       while (true)
+       {
 #ifndef WIN32
-       static rusage ru;
+               static rusage ru;
 #else
-       static time_t uptime;
-       static struct tm * stime;
-       static char window_title[100];
+               static time_t uptime;
+               static struct tm * stime;
+               static char window_title[100];
 #endif
 
-       /* time() seems to be a pretty expensive syscall, so avoid calling it too much.
-        * Once per loop iteration is pleanty.
-        */
-       OLDTIME = TIME;
-       TIME = time(NULL);
-
-       /* Run background module timers every few seconds
-        * (the docs say modules shouldnt rely on accurate
-        * timing using this event, so we dont have to
-        * time this exactly).
-        */
-       if (TIME != OLDTIME)
-       {
-               if (TIME < OLDTIME)
-                       WriteOpers("*** \002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %d secs.",abs(OLDTIME-TIME));
-               if ((TIME % 3600) == 0)
-               {
-                       this->RehashUsersAndChans();
-                       FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect());
-               }
-               Timers->TickTimers(TIME);
-               this->DoBackgroundUserStuff(TIME);
+               /* time() seems to be a pretty expensive syscall, so avoid calling it too much.
+                * Once per loop iteration is pleanty.
+                */
+               OLDTIME = TIME;
+               TIME = time(NULL);
 
-               if ((TIME % 5) == 0)
+               /* Run background module timers every few seconds
+                * (the docs say modules shouldnt rely on accurate
+                * timing using this event, so we dont have to
+                * time this exactly).
+                */
+               if (TIME != OLDTIME)
                {
-                       XLines->expire_lines();
-                       FOREACH_MOD_I(this,I_OnBackgroundTimer,OnBackgroundTimer(TIME));
-                       Timers->TickMissedTimers(TIME);
-               }
+                       if (TIME < OLDTIME)
+                               WriteOpers("*** \002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %d secs.",abs(OLDTIME-TIME));
+                       if ((TIME % 3600) == 0)
+                       {
+                               this->RehashUsersAndChans();
+                               FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect());
+                       }
+                       Timers->TickTimers(TIME);
+                       this->DoBackgroundUserStuff(TIME);
+
+                       if ((TIME % 5) == 0)
+                       {
+                               XLines->expire_lines();
+                               FOREACH_MOD_I(this,I_OnBackgroundTimer,OnBackgroundTimer(TIME));
+                               Timers->TickMissedTimers(TIME);
+                       }
 #ifndef WIN32
-               /* Same change as in cmd_stats.cpp, use RUSAGE_SELF rather than '0' -- Om */
-               if (!getrusage(RUSAGE_SELF, &ru))
-               {
-                       gettimeofday(&this->stats->LastSampled, NULL);
-                       this->stats->LastCPU = ru.ru_utime;
-               }
+                       /* Same change as in cmd_stats.cpp, use RUSAGE_SELF rather than '0' -- Om */
+                       if (!getrusage(RUSAGE_SELF, &ru))
+                       {
+                               gettimeofday(&this->stats->LastSampled, NULL);
+                               this->stats->LastCPU = ru.ru_utime;
+                       }
 #else
-               WindowsIPC->Check();
-
-               if(Config->nofork)
-               {
-                       uptime = Time() - startup_time;
-                       stime = gmtime(&uptime);
-                       snprintf(window_title, 100, "InspIRCd - %u clients, %u accepted connections - Up %u days, %.2u:%.2u:%.2u",
-                               LocalUserCount(), stats->statsAccept, stime->tm_yday, stime->tm_hour, stime->tm_min, stime->tm_sec);
-                       SetConsoleTitle(window_title);
-               }
+                       WindowsIPC->Check();
+       
+                       if(Config->nofork)
+                       {
+                               uptime = Time() - startup_time;
+                               stime = gmtime(&uptime);
+                               snprintf(window_title, 100, "InspIRCd - %u clients, %u accepted connections - Up %u days, %.2u:%.2u:%.2u",
+                                       LocalUserCount(), stats->statsAccept, stime->tm_yday, stime->tm_hour, stime->tm_min, stime->tm_sec);
+                               SetConsoleTitle(window_title);
+                       }
 #endif
-       }
+               }
 
-       /* Call the socket engine to wait on the active
-        * file descriptors. The socket engine has everything's
-        * descriptors in its list... dns, modules, users,
-        * servers... so its nice and easy, just one call.
-        * This will cause any read or write events to be
-        * dispatched to their handlers.
-        */
-       this->SE->DispatchEvents();
+               /* Call the socket engine to wait on the active
+                * file descriptors. The socket engine has everything's
+                * descriptors in its list... dns, modules, users,
+                * servers... so its nice and easy, just one call.
+                * This will cause any read or write events to be
+                * dispatched to their handlers.
+                */
+               this->SE->DispatchEvents();
 
-       /* if any users was quit, take them out */
-       this->GlobalCulls.Apply();
+               /* if any users was quit, take them out */
+               this->GlobalCulls.Apply();
 
-       /* If any inspsockets closed, remove them */
-       this->InspSocketCull();
+               /* If any inspsockets closed, remove them */
+               this->InspSocketCull();
 
-       if (this->s_signal)
-       {
-               this->SignalHandler(s_signal);
-               this->s_signal = 0;
+               if (this->s_signal)
+               {
+                       this->SignalHandler(s_signal);
+                       this->s_signal = 0;
+               }
        }
 
+       return 0;
 }
 
 void InspIRCd::InspSocketCull()
@@ -679,23 +683,13 @@ void InspIRCd::InspSocketCull()
        SocketCull.clear();
 }
 
-int InspIRCd::Run()
-{
-       while (true)
-       {
-               DoOneIteration(true);
-       }
-       /* This is never reached -- we hope! */
-       return 0;
-}
-
 /**********************************************************************************/
 
 /**
  * An ircd in four lines! bwahahaha. ahahahahaha. ahahah *cough*.
  */
 
-int main(int argc, char** argv)
+int ircd(int argc, char ** argv)
 {
        SI = new InspIRCd(argc, argv);
        mysig = &SI->s_signal;
@@ -704,6 +698,23 @@ int main(int argc, char** argv)
        return 0;
 }
 
+#ifdef WINDOWS
+
+int main(int argc, char ** argv)
+{
+       __try {
+               ircd(argc,argv);
+       } __except(__exceptionHandler(GetExceptionInformation())) {}
+       return 0;
+}
+
+#else
+int main(int argc, char** argv)
+{
+       return ircd(argc,argv);
+}
+#endif
+
 /* this returns true when all modules are satisfied that the user should be allowed onto the irc server
  * (until this returns true, a user will block in the waiting state, waiting to connect up to the
  * registration timeout maximum seconds)