Move the <disabled> tag out of the core to a new module.

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

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index ab5a9e1918311362e4b2a79a48b7d3cc5a844122..09e48ea1fa2840e1a2a77d4a32646ea9b9d056ca 100644 (file)
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -271,6 +271,16 @@ InspIRCd::InspIRCd(int argc, char** argv) :
        srandom(TIME.tv_nsec ^ TIME.tv_sec);
 #endif
 
+       {
+               ServiceProvider* provs[] =
+               {
+                       &rfcevents.numeric, &rfcevents.join, &rfcevents.part, &rfcevents.kick, &rfcevents.quit, &rfcevents.nick,
+                       &rfcevents.mode, &rfcevents.topic, &rfcevents.privmsg, &rfcevents.invite, &rfcevents.ping, &rfcevents.pong,
+                       &rfcevents.error
+               };
+               Modules.AddServices(provs, sizeof(provs)/sizeof(provs[0]));
+       }
+
        struct option longopts[] =
        {
                { "nofork",     no_argument,            &do_nofork,     1       },
@@ -294,7 +304,16 @@ InspIRCd::InspIRCd(int argc, char** argv) :
                {
                        case 'c':
                                /* Config filename was set */
-                               ConfigFileName = ServerInstance->Config->Paths.PrependConfig(optarg);
+                               ConfigFileName = optarg;
+#ifdef _WIN32
+                               TCHAR configPath[MAX_PATH + 1];
+                               if (GetFullPathName(optarg, MAX_PATH, configPath, NULL) > 0)
+                                       ConfigFileName = configPath;
+#else
+                               char configPath[PATH_MAX + 1];
+                               if (realpath(optarg, configPath))
+                                       ConfigFileName = configPath;
+#endif
                        break;
                        case 0:
                                /* getopt_long_only() set an int variable, just keep going */
@@ -423,7 +442,6 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
        // Build ISupport as ModuleManager::LoadAll() does not do it
        this->ISupport.Build();
-       Config->ApplyDisabledCommands();
 
        if (!pl.empty())
        {
@@ -625,14 +643,15 @@ void InspIRCd::Run()
                        }
 #endif
 
-                       /* Allow a buffer of two seconds drift on this so that ntpdate etc dont harass admins */
-                       if (TIME.tv_sec < OLDTIME - 2)
-                       {
-                               SNO->WriteToSnoMask('d', "\002EH?!\002 -- Time is flowing BACKWARDS in this dimension! Clock drifted backwards %lu secs.", (unsigned long)(OLDTIME-TIME.tv_sec));
-                       }
-                       else if (TIME.tv_sec > OLDTIME + 2)
+                       if (Config->TimeSkipWarn)
                        {
-                               SNO->WriteToSnoMask('d', "\002EH?!\002 -- Time is jumping FORWARDS! Clock skipped %lu secs.", (unsigned long)(TIME.tv_sec - OLDTIME));
+                               time_t timediff = TIME.tv_sec - OLDTIME;
+
+                               if (timediff > Config->TimeSkipWarn)
+                                       SNO->WriteToSnoMask('a', "\002Performance warning!\002 Server clock jumped forwards by %lu seconds!", timediff);
+
+                               else if (timediff < -Config->TimeSkipWarn)
+                                       SNO->WriteToSnoMask('a', "\002Performance warning!\002 Server clock jumped backwards by %lu seconds!", labs(timediff));
                        }
 
                        OLDTIME = TIME.tv_sec;