X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Finspircd.cpp;h=20001dbca19ec20f07a41cf4bfb9f09ee8e74936;hb=7ece928bab20881d6fe24c4479f4ff9e0a8a7179;hp=69aa2619ccc6f9a00c600dde581b5f3718fd2807;hpb=a71f34e4b17420cacc4a50c5af64fe15811a8148;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/inspircd.cpp b/src/inspircd.cpp
index 69aa2619c..20001dbca 100644
--- a/src/inspircd.cpp
+++ b/src/inspircd.cpp
@@ -194,7 +194,7 @@ bool InspIRCd::DaemonSeed()
 #endif
 }
 
-void InspIRCd::WritePID(const std::string &filename)
+void InspIRCd::WritePID(const std::string& filename, bool exitonfail)
 {
 #ifndef _WIN32
 	std::string fname(filename);
@@ -208,9 +208,11 @@ void InspIRCd::WritePID(const std::string &filename)
 	}
 	else
 	{
-		std::cout << "Failed to write PID-file '" << fname << "', exiting." << std::endl;
-		this->Logs->Log("STARTUP", LOG_DEFAULT, "Failed to write PID-file '%s', exiting.",fname.c_str());
-		Exit(EXIT_STATUS_PID);
+		if (exitonfail)
+			std::cout << "Failed to write PID-file '" << fname << "', exiting." << std::endl;
+		this->Logs->Log("STARTUP", LOG_DEFAULT, "Failed to write PID-file '%s'%s", fname.c_str(), (exitonfail ? ", exiting." : ""));
+		if (exitonfail)
+			Exit(EXIT_STATUS_PID);
 	}
 #endif
 }
@@ -224,17 +226,13 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 	  * THIS MUST MATCH THE ORDER OF DECLARATION OF THE FUNCTORS, e.g. the methods
 	  * themselves within the class.
 	  */
-	 OperQuit("operquit", ExtensionItem::EXT_USER, NULL),
 	 GenRandom(&HandleGenRandom),
 	 IsChannel(&HandleIsChannel),
-	 IsNick(&HandleIsNick),
-	 IsIdent(&HandleIsIdent),
-	 OnCheckExemption(&HandleOnCheckExemption)
+	 IsNick(&DefaultIsNick),
+	 IsIdent(&HandleIsIdent)
 {
 	ServerInstance = this;
 
-	Extensions.Register(&OperQuit);
-
 	FailedPortList pl;
 	// Flag variables passed to getopt_long() later
 	int do_version = 0, do_nofork = 0, do_debug = 0,
@@ -311,7 +309,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 				/* Fall through to handle other weird values too */
 				std::cout << "Unknown parameter '" << argv[optind-1] << "'" << std::endl;
 				std::cout << "Usage: " << argv[0] << " [--nofork] [--nolog] [--debug] [--config <config>]" << std::endl <<
-					std::string(static_cast<int>(8+strlen(argv[0])), ' ') << "[--runasroot] [--version]" << std::endl;
+					std::string(static_cast<size_t>(8+strlen(argv[0])), ' ') << "[--runasroot] [--version]" << std::endl;
 				Exit(EXIT_STATUS_ARGV);
 			break;
 		}
@@ -324,7 +322,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
 	if (do_version)
 	{
-		std::cout << std::endl << INSPIRCD_VERSION << " " << INSPIRCD_REVISION << std::endl;
+		std::cout << std::endl << INSPIRCD_VERSION << std::endl;
 		Exit(EXIT_STATUS_NOERROR);
 	}
 
@@ -341,7 +339,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
 	if (do_debug)
 	{
-		FileWriter* fw = new FileWriter(stdout);
+		FileWriter* fw = new FileWriter(stdout, 1);
 		FileLogStream* fls = new FileLogStream(LOG_RAWIO, fw);
 		Logs->AddLogTypes("*", fls, true);
 	}
@@ -366,7 +364,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 		}
 	}
 
-	std::cout << con_green << "InspIRCd - Internet Relay Chat Daemon" << con_reset << ", compiled on " __DATE__ " at " __TIME__ << std::endl;
+	std::cout << con_green << "InspIRCd - Internet Relay Chat Daemon" << con_reset << std::endl;
 	std::cout << "For contributors & authors: " << con_green << "See /INFO Output" << con_reset << std::endl;
 
 #ifndef _WIN32
@@ -429,7 +427,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 
 	// Build ISupport as ModuleManager::LoadAll() does not do it
 	this->ISupport.Build();
-	Config->ApplyDisabledCommands(Config->DisabledCommands);
+	Config->ApplyDisabledCommands();
 
 	if (!pl.empty())
 	{
@@ -439,7 +437,7 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 		int j = 1;
 		for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++)
 		{
-			std::cout << j << ".\tAddress: " << (i->first.empty() ? "<all>" : i->first) << " \tReason: " << i->second << std::endl;
+			std::cout << j << ".\tAddress: " << i->first.str() << " \tReason: " << strerror(i->second) << std::endl;
 		}
 
 		std::cout << std::endl << "Hint: Try using a public IP instead of blank or *" << std::endl;
@@ -500,64 +498,49 @@ InspIRCd::InspIRCd(int argc, char** argv) :
 	QueryPerformanceFrequency(&stats.QPFrequency);
 #endif
 
-	Logs->Log("STARTUP", LOG_DEFAULT, "Startup complete as '%s'[%s], %d max open sockets", Config->ServerName.c_str(),Config->GetSID().c_str(), SocketEngine::GetMaxFds());
+	Logs->Log("STARTUP", LOG_DEFAULT, "Startup complete as '%s'[%s], %lu max open sockets", Config->ServerName.c_str(),Config->GetSID().c_str(), SocketEngine::GetMaxFds());
 
 #ifndef _WIN32
-	std::string SetUser = Config->ConfValue("security")->getString("runasuser");
-	std::string SetGroup = Config->ConfValue("security")->getString("runasgroup");
+	ConfigTag* security = Config->ConfValue("security");
+
+	const std::string SetGroup = security->getString("runasgroup");
 	if (!SetGroup.empty())
 	{
-		int ret;
-
-		// setgroups
-		ret = setgroups(0, NULL);
-
-		if (ret == -1)
+		errno = 0;
+		if (setgroups(0, NULL) == -1)
 		{
 			this->Logs->Log("STARTUP", LOG_DEFAULT, "setgroups() failed (wtf?): %s", strerror(errno));
 			this->QuickExit(0);
 		}
 
-		// setgid
-		struct group *g;
-
-		errno = 0;
-		g = getgrnam(SetGroup.c_str());
-
+		struct group* g = getgrnam(SetGroup.c_str());
 		if (!g)
 		{
 			this->Logs->Log("STARTUP", LOG_DEFAULT, "getgrnam(%s) failed (wrong group?): %s", SetGroup.c_str(), strerror(errno));
 			this->QuickExit(0);
 		}
 
-		ret = setgid(g->gr_gid);
-
-		if (ret == -1)
+		if (setgid(g->gr_gid) == -1)
 		{
-			this->Logs->Log("STARTUP", LOG_DEFAULT, "setgid() failed (wrong group?): %s", strerror(errno));
+			this->Logs->Log("STARTUP", LOG_DEFAULT, "setgid(%d) failed (wrong group?): %s", g->gr_gid, strerror(errno));
 			this->QuickExit(0);
 		}
 	}
 
+	const std::string SetUser = security->getString("runasuser");
 	if (!SetUser.empty())
 	{
-		// setuid
-		struct passwd *u;
-
 		errno = 0;
-		u = getpwnam(SetUser.c_str());
-
+		struct passwd* u = getpwnam(SetUser.c_str());
 		if (!u)
 		{
 			this->Logs->Log("STARTUP", LOG_DEFAULT, "getpwnam(%s) failed (wrong user?): %s", SetUser.c_str(), strerror(errno));
 			this->QuickExit(0);
 		}
 
-		int ret = setuid(u->pw_uid);
-
-		if (ret == -1)
+		if (setuid(u->pw_uid) == -1)
 		{
-			this->Logs->Log("STARTUP", LOG_DEFAULT, "setuid() failed (wrong user?): %s", strerror(errno));
+			this->Logs->Log("STARTUP", LOG_DEFAULT, "setuid(%d) failed (wrong user?): %s", u->pw_uid, strerror(errno));
 			this->QuickExit(0);
 		}
 	}
@@ -649,18 +632,25 @@ void InspIRCd::Run()
 			/* 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);
+				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)
 			{
-				SNO->WriteToSnoMask('d', "\002EH?!\002 -- Time is jumping FORWARDS! Clock skipped %lu secs.", (unsigned long)TIME.tv_sec - OLDTIME);
+				SNO->WriteToSnoMask('d', "\002EH?!\002 -- Time is jumping FORWARDS! Clock skipped %lu secs.", (unsigned long)(TIME.tv_sec - OLDTIME));
 			}
 
 			OLDTIME = TIME.tv_sec;
 
 			if ((TIME.tv_sec % 3600) == 0)
+			{
 				FOREACH_MOD(OnGarbageCollect, ());
 
+				// HACK: ELines are not expired properly at the moment but it can't be fixed as
+				// the 2.0 XLine system is a spaghetti nightmare. Instead we skip over expired
+				// ELines in XLineManager::CheckELines() and expire them here instead.
+				XLines->GetAll("E");
+			}
+
 			Timers.TickTimers(TIME.tv_sec);
 			Users->DoBackgroundUserStuff();