#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);
}
}
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->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 VERSION " " + Config->ServerName + " :" SYSTEM " [" REVISION "," INSPIRCD_SOCKETENGINE_NAME "," + Config->sid + "]";
+ return 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;
sid = 5 * sid + *i;
std::string sidstr = ConvToStr(sid % 1000);
+ sidstr.insert(0, 3 - sidstr.length(), '0');
return sidstr;
}
* -- w
*/
+ current_uid.resize(UUID_LENGTH, '9');
current_uid[0] = sid[0];
current_uid[1] = sid[1];
current_uid[2] = sid[2];
-
- for (int i = 3; i < (UUID_LENGTH - 1); i++)
- current_uid[i] = '9';
-
- // Null terminator. Important.
- current_uid[UUID_LENGTH - 1] = '\0';
}
/*
while (1)
{
// Add one to the last UID
- this->IncrementUID(UUID_LENGTH - 2);
+ this->IncrementUID(UUID_LENGTH - 1);
if (!ServerInstance->FindUUID(current_uid))
break;
* the future we can use an initializer list here.
*/
std::map<std::string, std::string> tokens;
- std::vector<std::string> 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["FNC"] = tokens["VBANLIST"] =
tokens["WALLCHOPS"] = tokens["WALLVOICES"];
- 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<std::string, std::string>::iterator extban = tokens.find("EXTBAN");
extban->second.insert(0, ",");
}
- for (std::map<std::string, std::string>::iterator it = tokens.begin(); it != tokens.end(); it++)
+ // Transform the map into a list of lines, ready to be sent to clients
+ std::vector<std::string>& lines = this->Lines;
+ std::string line;
+ unsigned int token_count = 0;
+ lines.clear();
+
+ for (std::map<std::string, std::string>::const_iterator it = tokens.begin(); it != tokens.end(); ++it)
{
- line.append(it->first + (it->second.empty() ? " " : "=" + it->second + " "));
+ line.append(it->first);
+
+ // If this token has a value then append a '=' char after the name and then the value itself
+ if (!it->second.empty())
+ line.append(1, '=').append(it->second);
+
+ // Always append a space, even if it's the last token because all lines will be suffixed
+ line.push_back(' ');
token_count++;
if (token_count % 13 == 12 || it == --tokens.end())
{
+ // 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
line.append(":are supported by this server");
lines.push_back(line);
line.clear();
}
}
-
- this->Lines = lines;
}
void ISupportManager::SendTo(LocalUser* user)
{
- for (std::vector<std::string>::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<std::string>::const_iterator i = this->Lines.begin(); i != this->Lines.end(); ++i)
+ user->WriteNumeric(RPL_ISUPPORT, *i);
}
projects / user / henk / code / inspircd.git / blobdiff