X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fserver.cpp;h=4814852c499bfc31f570108eb6ed0b50a4b76fe6;hb=20680f9c4964a5e10e3649a1e479078ff85c5c85;hp=f163bc7335e5ae573b6f9d68bc9c2fe338823d4a;hpb=ab6a7318e36bd8e0a259cd9eef3694a0f0e8684a;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/server.cpp b/src/server.cpp
index f163bc733..4814852c4 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2,11 +2,11 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *	    the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -33,7 +33,6 @@ void InspIRCd::SignalHandler(int signal)
 
 void InspIRCd::Exit(int status)
 {
-	printf("exit with status %d\n", status);
 #ifdef WINDOWS
 	delete WindowsIPC;
 #endif
@@ -42,32 +41,36 @@ void InspIRCd::Exit(int status)
 		this->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")");
 		this->Cleanup();
 	}
-	printf("Exit done.\n");
 	exit (status);
 }
 
 void InspIRCd::Rehash()
 {
-	this->WriteOpers("*** Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(this->ConfigFileName));
-	this->CloseLog();
-	if (!this->OpenLog(this->Config->argv, this->Config->argc))
-		this->WriteOpers("*** ERROR: Could not open logfile %s: %s", Config->logpath.c_str(), strerror(errno));
+	this->SNO->WriteToSnoMask('A', "Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(this->ConfigFileName));
 	this->RehashUsersAndChans();
 	FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect());
-	this->Config->Read(false,NULL);
-	this->ResetMaxBans();
-	this->Res->Rehash();
-	FOREACH_MOD_I(this,I_OnRehash,OnRehash(NULL,""));
-	this->BuildISupport();
+	if (!this->ConfigThread)
+	{
+		Config->RehashUser = NULL;
+		Config->RehashParameter = "";
+
+		ConfigThread = new ConfigReaderThread(this, false, NULL);
+		Threads->Create(ConfigThread);
+	}
 }
 
 void InspIRCd::RehashServer()
 {
-	this->WriteOpers("*** Rehashing config file");
+	this->SNO->WriteToSnoMask('A', "Rehashing config file");
 	this->RehashUsersAndChans();
-	this->Config->Read(false,NULL);
-	this->ResetMaxBans();
-	this->Res->Rehash();
+	if (!this->ConfigThread)
+	{
+		Config->RehashUser = NULL;
+		Config->RehashParameter = "";
+
+		ConfigThread = new ConfigReaderThread(this, false, NULL);
+		Threads->Create(ConfigThread);
+	}
 }
 
 std::string InspIRCd::GetVersionString()
@@ -79,7 +82,7 @@ std::string InspIRCd::GetVersionString()
 	}
 	else
 	{
-		snprintf(versiondata,MAXBUF,"%s %s :%s [FLAGS=%s,%s,%d]",VERSION,Config->ServerName,SYSTEM,REVISION,SE->GetName().c_str(),Config->sid);
+		snprintf(versiondata,MAXBUF,"%s %s :%s [FLAGS=%s,%s,%s]",VERSION,Config->ServerName,SYSTEM,REVISION,SE->GetName().c_str(),Config->sid);
 	}
 	return versiondata;
 }
@@ -89,8 +92,8 @@ 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=@%+ CHARSET=ascii TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=" << Config->MaxTargets << " AWAYLEN=";
-	v << MAXAWAY << " CHANMODES=" << this->Modes->ChanModes() << " FNC NETWORK=" << Config->Network << " MAXPARA=32 ELIST=MU";
+	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";
 	Config->data005 = v.str();
 	FOREACH_MOD_I(this,I_On005Numeric,On005Numeric(Config->data005));
 	Config->Update005();
@@ -108,7 +111,7 @@ void InspIRCd::AddServerName(const std::string &servername)
 		if(**itr == servername)
 			return;
 
-	string * ns = new string(servername);
+	std::string * ns = new std::string(servername);
 	servernames.push_back(ns);
 }
 
@@ -119,7 +122,7 @@ const char* InspIRCd::FindServerNamePtr(const std::string &servername)
 		if(**itr == servername)
 			return (*itr)->c_str();
 
-	servernames.push_back(new string(servername));
+	servernames.push_back(new std::string(servername));
 	itr = --servernames.end();
 	return (*itr)->c_str();
 }