X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fserver.cpp;h=f22cf1ad4a168f275a9c1d5e96a6debaea771616;hb=8dbd80610aee01b8064ca813e1dd7ca44ab3f7b6;hp=6790b45e77715a37020345b72db58948635c90f9;hpb=8790551dc182cd8804ee7d8ef89ccb31067cc2a4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/server.cpp b/src/server.cpp index 6790b45e7..f22cf1ad4 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -31,12 +31,13 @@ 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 { - Exit(signal); + Exit(EXIT_STATUS_SIGTERM); } } @@ -45,45 +46,28 @@ void InspIRCd::Exit(int status) #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->Cleanup(); + ServerInstance = NULL; + delete this; 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(I_OnGarbageCollect, OnGarbageCollect()); if (!ServerInstance->ConfigThread) { - ServerInstance->ConfigThread = new ConfigReaderThread(""); - ServerInstance->Threads->Start(ServerInstance->ConfigThread); + ServerInstance->ConfigThread = new ConfigReaderThread(uuid); + ServerInstance->Threads.Start(ServerInstance->ConfigThread); } } -std::string InspIRCd::GetVersionString(bool operstring) +std::string InspIRCd::GetVersionString(bool getFullVersion) { - char versiondata[MAXBUF]; - if (operstring) - { - 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,"%s %s :%s",BRANCH,Config->ServerName.c_str(),Config->CustomVersion.c_str()); - return versiondata; + if (getFullVersion) + return INSPIRCD_VERSION " " + Config->ServerName + " :" INSPIRCD_SYSTEM " [" INSPIRCD_REVISION "," INSPIRCD_SOCKETENGINE_NAME "," + Config->sid + "]"; + return INSPIRCD_BRANCH " " + Config->ServerName + " :" + Config->CustomVersion; } -const char InspIRCd::LogHeader[] = - "Log started for " VERSION " (" REVISION ", " MODULE_INIT_STR ")" - " - compiled on " SYSTEM; - - std::string UIDGenerator::GenerateSID(const std::string& servername, const std::string& serverdesc) { unsigned int sid = 0; @@ -94,6 +78,7 @@ std::string UIDGenerator::GenerateSID(const std::string& servername, const std:: sid = 5 * sid + *i; std::string sidstr = ConvToStr(sid % 1000); + sidstr.insert(0, 3 - sidstr.length(), '0'); return sidstr; } @@ -177,60 +162,66 @@ void ISupportManager::Build() * the future we can use an initializer list here. */ std::map tokens; - std::vector lines; - int token_count = 0; - std::string line; tokens["AWAYLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxAway); tokens["CASEMAPPING"] = "rfc1459"; - tokens["CHANMODES"] = ConvToStr(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. tokens["MAXCHANNELS"] = ConvToStr(ServerInstance->Config->MaxChans); - tokens["MAXPARA"] = ConvToStr(MAXPARAMETERS); tokens["MAXTARGETS"] = ConvToStr(ServerInstance->Config->MaxTargets); tokens["MODES"] = ConvToStr(ServerInstance->Config->Limits.MaxModes); - tokens["NETWORK"] = ConvToStr(ServerInstance->Config->Network); + tokens["NETWORK"] = ServerInstance->Config->Network; tokens["NICKLEN"] = ConvToStr(ServerInstance->Config->Limits.NickMax); tokens["PREFIX"] = ServerInstance->Modes->BuildPrefixes(); tokens["STATUSMSG"] = ServerInstance->Modes->BuildPrefixes(false); tokens["TOPICLEN"] = ConvToStr(ServerInstance->Config->Limits.MaxTopic); - tokens["FNC"] = tokens["MAP"] = tokens["VBANLIST"] = - tokens["WALLCHOPS"] = tokens["WALLVOICES"]; + tokens["FNC"] = tokens["VBANLIST"]; - FOREACH_MOD(I_On005Numeric, On005Numeric(tokens)); + // Modules can add new tokens and also edit or remove existing tokens + FOREACH_MOD(On005Numeric, (tokens)); // EXTBAN is a special case as we need to sort it and prepend a comma. std::map::iterator extban = tokens.find("EXTBAN"); if (extban != tokens.end()) { - sort(extban->second.begin(), extban->second.end()); + std::sort(extban->second.begin(), extban->second.end()); extban->second.insert(0, ","); } - for (std::map::iterator it = tokens.begin(); it != tokens.end(); it++) + // Transform the map into a list of lines, ready to be sent to clients + Numeric::Numeric numeric(RPL_ISUPPORT); + unsigned int token_count = 0; + cachedlines.clear(); + + for (std::map::const_iterator it = tokens.begin(); it != tokens.end(); ++it) { - line.append(it->first + (it->second.empty() ? " " : "=" + it->second + " ")); + numeric.push(it->first); + std::string& token = numeric.GetParams().back(); + + // If this token has a value then append a '=' char after the name and then the value itself + if (!it->second.empty()) + token.append(1, '=').append(it->second); + token_count++; if (token_count % 13 == 12 || it == --tokens.end()) { - line.append(":are supported by this server"); - lines.push_back(line); - line.clear(); + // Reached maximum number of tokens for this line or the current token + // is the last one; finalize the line and store it for later use + numeric.push("are supported by this server"); + cachedlines.push_back(numeric); + numeric.GetParams().clear(); } } - - this->Lines = lines; } void ISupportManager::SendTo(LocalUser* user) { - for (std::vector::iterator line = this->Lines.begin(); line != this->Lines.end(); line++) - user->WriteNumeric(RPL_ISUPPORT, "%s %s", user->nick.c_str(), line->c_str()); + for (std::vector::const_iterator i = cachedlines.begin(); i != cachedlines.end(); ++i) + user->WriteNumeric(*i); }