X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fserver.cpp;h=01f523e4708ff5af90efed6af6b4f82210cbeaaf;hb=090e7b616104723960ab51d8faa966af333eb15d;hp=d0023edd453e838b9bce5b54932a78077d24abdc;hpb=d9d33e7246baf59241d083eb2c253e729390d205;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/server.cpp b/src/server.cpp
index d0023edd4..01f523e47 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *	    the file COPYING for details.
@@ -11,7 +11,7 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDserver */
+/* $Core */
 
 #include <signal.h>
 #include "exitcodes.h"
@@ -23,7 +23,7 @@ void InspIRCd::SignalHandler(int signal)
 	switch (signal)
 	{
 		case SIGHUP:
-			Rehash();
+			Rehash("due to SIGHUP");
 			break;
 		case SIGTERM:
 			Exit(signal);
@@ -34,7 +34,9 @@ void InspIRCd::SignalHandler(int signal)
 void InspIRCd::Exit(int status)
 {
 #ifdef WINDOWS
-	delete WindowsIPC;
+	if (WindowsIPC)
+		delete WindowsIPC;
+	SetServiceStopped(status);
 #endif
 	if (this)
 	{
@@ -44,33 +46,21 @@ void InspIRCd::Exit(int status)
 	exit (status);
 }
 
-void InspIRCd::Rehash()
+void RehashHandler::Call(const std::string &reason)
 {
-	this->SNO->WriteToSnoMask('A', "Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(this->ConfigFileName));
-	this->RehashUsersAndChans();
-	FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect());
-	if (!this->ConfigThread)
+	Server->SNO->WriteToSnoMask('a', "Rehashing config file %s %s",ServerConfig::CleanFilename(Server->ConfigFileName), reason.c_str());
+	Server->RehashUsersAndChans();
+	FOREACH_MOD_I(Server, I_OnGarbageCollect, OnGarbageCollect());
+	if (!Server->ConfigThread)
 	{
-		Config->RehashUser = NULL;
-		Config->RehashParameter = "";
-
-		ConfigThread = new ConfigReaderThread(this, false, NULL);
-		Threads->Create(ConfigThread);
+		Server->ConfigThread = new ConfigReaderThread(Server, "");
+		Server->Threads->Start(Server->ConfigThread);
 	}
 }
 
 void InspIRCd::RehashServer()
 {
-	this->SNO->WriteToSnoMask('A', "Rehashing config file");
-	this->RehashUsersAndChans();
-	if (!this->ConfigThread)
-	{
-		Config->RehashUser = NULL;
-		Config->RehashParameter = "";
-
-		ConfigThread = new ConfigReaderThread(this, false, NULL);
-		Threads->Create(ConfigThread);
-	}
+	this->Rehash("");
 }
 
 std::string InspIRCd::GetVersionString()
@@ -78,11 +68,11 @@ std::string InspIRCd::GetVersionString()
 	char versiondata[MAXBUF];
 	if (*Config->CustomVersion)
 	{
-		snprintf(versiondata,MAXBUF,"%s %s :%s",VERSION,Config->ServerName,Config->CustomVersion);
+		snprintf(versiondata,MAXBUF,"InspIRCd-1.2 %s :%s",Config->ServerName,Config->CustomVersion);
 	}
 	else
 	{
-		snprintf(versiondata,MAXBUF,"%s %s :%s [FLAGS=%s,%s,%s]",VERSION,Config->ServerName,SYSTEM,REVISION,SE->GetName().c_str(),Config->sid);
+		snprintf(versiondata,MAXBUF,"InspIRCd-1.2 %s :%s (%s) [FLAGS=%s,%s,%s]",Config->ServerName,SYSTEM,VERSION,REVISION,SE->GetName().c_str(),Config->sid);
 	}
 	return versiondata;
 }
@@ -91,9 +81,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 WALLVOICES MODES=" << MAXMODES << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << Config->MaxChans << " MAXBANS=60 VBANLIST NICKLEN=" << NICKMAX-1;
-	v << " CASEMAPPING=rfc1459 STATUSMSG=@" << (this->Config->AllowHalfop ? "%" : "") << "+ CHARSET=ascii TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=" << Config->MaxTargets;
-	v << " AWAYLEN=" << MAXAWAY << " CHANMODES=" << this->Modes->ChanModes() << " FNC NETWORK=" << Config->Network << " MAXPARA=32 ELIST=MU";
+	v << "WALLCHOPS WALLVOICES MODES=" << Config->Limits.MaxModes << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << Config->MaxChans << " MAXBANS=60 VBANLIST NICKLEN=" << Config->Limits.NickMax;
+	v << " CASEMAPPING=rfc1459 STATUSMSG=@" << (this->Config->AllowHalfop ? "%" : "") << "+ CHARSET=ascii TOPICLEN=" << Config->Limits.MaxTopic << " KICKLEN=" << Config->Limits.MaxKick << " MAXTARGETS=" << Config->MaxTargets;
+	v << " AWAYLEN=" << Config->Limits.MaxAway << " CHANMODES=" << this->Modes->GiveModeList(MASK_CHANNEL) << " FNC NETWORK=" << Config->Network << " MAXPARA=32 ELIST=MU";
 	Config->data005 = v.str();
 	FOREACH_MOD_I(this,I_On005Numeric,On005Numeric(Config->data005));
 	Config->Update005();
@@ -153,7 +143,7 @@ void InspIRCd::IncrementUID(int pos)
 			for (int i = 3; i < UUID_LENGTH; i++)
 			{
 				current_uid[i] = 'A';
-				pos  = UUID_LENGTH - 1;	
+				pos  = UUID_LENGTH - 1;
 			}
 		}
 		else