X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=7e299700be31e0fc2a7a97e9de1d46a56d488e56;hb=0a1f9bc59494a532a91bc9c8afcecb31ece656ee;hp=ab5a9e1918311362e4b2a79a48b7d3cc5a844122;hpb=9cd7a2e54683a05d175a86e901f2f0df7d680902;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index ab5a9e191..7e299700b 100644
--- 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 */
@@ -625,14 +644,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;