Prefix all definitions in config.h to avoid potential collisions.

[user/henk/code/inspircd.git] / src / server.cpp

diff --git a/src/server.cpp b/src/server.cpp
index 97b4058c0e321d00e2bb021d39a01c85d64ceacc..ac638a08c17ca42771b23b10fbf67645ecdf965c 100644 (file)
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -31,7 +31,8 @@ void InspIRCd::SignalHandler(int signal)
 #else
        if (signal == SIGHUP)
        {
-               Rehash("Caught SIGHUP");
+               ServerInstance->SNO->WriteGlobalSno('a', "Rehashing due to SIGHUP");
+               Rehash();
        }
        else if (signal == SIGTERM)
 #endif
@@ -55,13 +56,11 @@ void InspIRCd::Exit(int status)
        exit (status);
 }
 
-void RehashHandler::Call(const std::string &reason)
+void InspIRCd::Rehash(const std::string& uuid)
 {
-       ServerInstance->SNO->WriteToSnoMask('a', "Rehashing config file %s %s",ServerConfig::CleanFilename(ServerInstance->ConfigFileName.c_str()), reason.c_str());
-       FOREACH_MOD(OnGarbageCollect, ());
        if (!ServerInstance->ConfigThread)
        {
-               ServerInstance->ConfigThread = new ConfigReaderThread("");
+               ServerInstance->ConfigThread = new ConfigReaderThread(uuid);
                ServerInstance->Threads->Start(ServerInstance->ConfigThread);
        }
 }
@@ -69,8 +68,8 @@ void RehashHandler::Call(const std::string &reason)
 std::string InspIRCd::GetVersionString(bool getFullVersion)
 {
        if (getFullVersion)
-               return VERSION " " + Config->ServerName + " :" SYSTEM " [" REVISION "," + SE->GetName() + "," + Config->sid + "]";
-       return BRANCH " " + Config->ServerName + " :" + Config->CustomVersion;
+               return INSPIRCD_VERSION " " + Config->ServerName + " :" INSPIRCD_SYSTEM " [" INSPIRCD_REVISION "," INSPIRCD_SOCKETENGINE_NAME "," + Config->sid + "]";
+       return INSPIRCD_BRANCH " " + Config->ServerName + " :" + Config->CustomVersion;
 }
 
 std::string UIDGenerator::GenerateSID(const std::string& servername, const std::string& serverdesc)
@@ -170,10 +169,9 @@ void ISupportManager::Build()
 
        tokens["AWAYLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxAway);
        tokens["CASEMAPPING"] = "rfc1459";
-       tokens["CHANMODES"] = ServerInstance->Modes->GiveModeList(MASK_CHANNEL);
+       tokens["CHANMODES"] = ServerInstance->Modes->GiveModeList(MODETYPE_CHANNEL);
        tokens["CHANNELLEN"] = ConvToStr(ServerInstance->Config->Limits.ChanMax);
        tokens["CHANTYPES"] = "#";
-       tokens["CHARSET"] = "ascii";
        tokens["ELIST"] = "MU";
        tokens["KICKLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxKick);
        tokens["MAXBANS"] = "64"; // TODO: make this a config setting.
@@ -186,8 +184,7 @@ void ISupportManager::Build()
        tokens["STATUSMSG"] = ServerInstance->Modes->BuildPrefixes(false);
        tokens["TOPICLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxTopic);
 
-       tokens["FNC"] = tokens["VBANLIST"] =
-               tokens["WALLCHOPS"] = tokens["WALLVOICES"];
+       tokens["FNC"] = tokens["VBANLIST"];
 
        // Modules can add new tokens and also edit or remove existing tokens
        FOREACH_MOD(On005Numeric, (tokens));
@@ -232,5 +229,5 @@ void ISupportManager::Build()
 void ISupportManager::SendTo(LocalUser* user)
 {
        for (std::vector<std::string>::const_iterator i = this->Lines.begin(); i != this->Lines.end(); ++i)
-               user->WriteNumeric(RPL_ISUPPORT, "%s %s", user->nick.c_str(), i->c_str());
+               user->WriteNumeric(RPL_ISUPPORT, *i);
 }