X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fserver.cpp;h=d05ece8a45ac2c7f86bce4308dbb3fcc598687c9;hb=4e3d7a6e30eadf714483994681b8b2534229f4a8;hp=092826361ecfee713a787852b2469763ad221f2c;hpb=1a339033f34d0ce6719ef4f5308b757ef43cbfd2;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/server.cpp b/src/server.cpp
index 092826361..d05ece8a4 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -27,11 +27,15 @@
 
 void InspIRCd::SignalHandler(int signal)
 {
+#ifdef _WIN32
+	if (signal == SIGTERM)
+#else
 	if (signal == SIGHUP)
 	{
 		Rehash("Caught SIGHUP");
 	}
 	else if (signal == SIGTERM)
+#endif
 	{
 		Exit(signal);
 	}
@@ -39,18 +43,13 @@ void InspIRCd::SignalHandler(int signal)
 
 void InspIRCd::Exit(int status)
 {
-#ifdef WINDOWS
-	if (WindowsIPC)
-		delete WindowsIPC;
+#ifdef _WIN32
 	SetServiceStopped(status);
 #endif
-	if (this)
-	{
-		this->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")");
-		this->Cleanup();
-		delete this;
-		ServerInstance = NULL;
-	}
+	this->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")");
+	this->Cleanup();
+	delete this;
+	ServerInstance = NULL;
 	exit (status);
 }
 
@@ -70,9 +69,12 @@ std::string InspIRCd::GetVersionString(bool operstring)
 {
 	char versiondata[MAXBUF];
 	if (operstring)
-		snprintf(versiondata,MAXBUF,"%s %s :%s [%s,%s,%s]",VERSION,Config->ServerName.c_str(),SYSTEM,REVISION,SE->GetName().c_str(),Config->sid.c_str());
+	{
+		std::string sename = SE->GetName();
+		snprintf(versiondata,MAXBUF,"%s %s :%s [%s,%s,%s]",VERSION, Config->ServerName.c_str(), SYSTEM,REVISION, sename.c_str(), Config->sid.c_str());
+	}
 	else
-		snprintf(versiondata,MAXBUF,"InspIRCd-2.0 %s :%s",Config->ServerName.c_str(),Config->CustomVersion.c_str());
+		snprintf(versiondata,MAXBUF,"%s %s :%s",BRANCH,Config->ServerName.c_str(),Config->CustomVersion.c_str());
 	return versiondata;
 }
 
@@ -86,7 +88,7 @@ void InspIRCd::BuildISupport()
 	std::stringstream v;
 	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=" << Modes->BuildPrefixes(false) << " 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";
+	v << " AWAYLEN=" << Config->Limits.MaxAway << " CHANMODES=" << this->Modes->GiveModeList(MASK_CHANNEL) << " FNC NETWORK=" << Config->Network << " MAXPARA=32 ELIST=MU" << " CHANNELLEN=" << Config->Limits.ChanMax;
 	Config->data005 = v.str();
 	FOREACH_MOD(I_On005Numeric,On005Numeric(Config->data005));
 	Config->Update005();
@@ -138,17 +140,18 @@ void InspIRCd::IncrementUID(int pos)
  */
 std::string InspIRCd::GetUID()
 {
-	static int curindex = -1;
+	static bool inited = false;
 
 	/*
-	 * If -1, we're setting up. Copy SID into the first three digits, 9's to the rest, null term at the end
+	 * If we're setting up, copy SID into the first three digits, 9's to the rest, null term at the end
 	 * Why 9? Well, we increment before we find, otherwise we have an unnecessary copy, and I want UID to start at AAA..AA
 	 * and not AA..AB. So by initialising to 99999, we force it to rollover to AAAAA on the first IncrementUID call.
 	 * Kind of silly, but I like how it looks.
 	 *		-- w
 	 */
-	if (curindex == -1)
+	if (!inited)
 	{
+		inited = true;
 		current_uid[0] = Config->sid[0];
 		current_uid[1] = Config->sid[1];
 		current_uid[2] = Config->sid[2];
@@ -156,8 +159,6 @@ std::string InspIRCd::GetUID()
 		for (int i = 3; i < (UUID_LENGTH - 1); i++)
 			current_uid[i] = '9';
 
-		curindex = UUID_LENGTH - 2; // look at the end of the string now kthx, ignore null
-
 		// Null terminator. Important.
 		current_uid[UUID_LENGTH - 1] = '\0';
 	}
@@ -165,7 +166,7 @@ std::string InspIRCd::GetUID()
 	while (1)
 	{
 		// Add one to the last UID
-		this->IncrementUID(curindex);
+		this->IncrementUID(UUID_LENGTH - 2);
 
 		if (this->FindUUID(current_uid))
 		{