X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fserver.cpp;h=cea92ac51b8f646d2c7b3821d895674aca012132;hb=6d03943426dcce76ba66567a9b18425a5ebb4c0c;hp=4814852c499bfc31f570108eb6ed0b50a4b76fe6;hpb=ea3a764bb870e0bab1fa6498564eb63b8ede72be;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/server.cpp b/src/server.cpp index 4814852c4..cea92ac51 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -2,8 +2,8 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * InspIRCd: (C) 2002-2009 InspIRCd Development Team + * See: http://wiki.inspircd.org/Credits * * This program is free but copyrighted software; see * the file COPYING for details. @@ -11,11 +11,12 @@ * --------------------------------------------------- */ -/* $Core: libIRCDserver */ +/* $Core */ #include #include "exitcodes.h" #include "inspircd.h" +#include "inspircd_version.h" void InspIRCd::SignalHandler(int signal) @@ -23,7 +24,7 @@ void InspIRCd::SignalHandler(int signal) switch (signal) { case SIGHUP: - Rehash(); + Rehash("due to SIGHUP"); break; case SIGTERM: Exit(signal); @@ -34,43 +35,34 @@ void InspIRCd::SignalHandler(int signal) void InspIRCd::Exit(int status) { #ifdef WINDOWS - delete WindowsIPC; + if (WindowsIPC) + delete WindowsIPC; + SetServiceStopped(status); #endif if (this) { this->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")"); this->Cleanup(); + delete this; } exit (status); } -void InspIRCd::Rehash() +void RehashHandler::Call(const std::string &reason) { - this->SNO->WriteToSnoMask('A', "Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(this->ConfigFileName)); - this->RehashUsersAndChans(); - FOREACH_MOD_I(this, I_OnGarbageCollect, OnGarbageCollect()); - if (!this->ConfigThread) + ServerInstance->SNO->WriteToSnoMask('a', "Rehashing config file %s %s",ServerConfig::CleanFilename(ServerInstance->ConfigFileName.c_str()), reason.c_str()); + ServerInstance->RehashUsersAndChans(); + FOREACH_MOD(I_OnGarbageCollect, OnGarbageCollect()); + if (!ServerInstance->ConfigThread) { - Config->RehashUser = NULL; - Config->RehashParameter = ""; - - ConfigThread = new ConfigReaderThread(this, false, NULL); - Threads->Create(ConfigThread); + ServerInstance->ConfigThread = new ConfigReaderThread(""); + ServerInstance->Threads->Start(ServerInstance->ConfigThread); } } void InspIRCd::RehashServer() { - this->SNO->WriteToSnoMask('A', "Rehashing config file"); - this->RehashUsersAndChans(); - if (!this->ConfigThread) - { - Config->RehashUser = NULL; - Config->RehashParameter = ""; - - ConfigThread = new ConfigReaderThread(this, false, NULL); - Threads->Create(ConfigThread); - } + this->Rehash(""); } std::string InspIRCd::GetVersionString() @@ -78,11 +70,11 @@ std::string InspIRCd::GetVersionString() char versiondata[MAXBUF]; if (*Config->CustomVersion) { - snprintf(versiondata,MAXBUF,"%s %s :%s",VERSION,Config->ServerName,Config->CustomVersion); + snprintf(versiondata,MAXBUF,"InspIRCd-2.0 %s :%s",Config->ServerName,Config->CustomVersion); } else { - snprintf(versiondata,MAXBUF,"%s %s :%s [FLAGS=%s,%s,%s]",VERSION,Config->ServerName,SYSTEM,REVISION,SE->GetName().c_str(),Config->sid); + snprintf(versiondata,MAXBUF,"InspIRCd-2.0 %s :%s (%s) [FLAGS=%s,%s,%s]",Config->ServerName,SYSTEM,VERSION,REVISION,SE->GetName().c_str(),Config->sid); } return versiondata; } @@ -91,11 +83,11 @@ 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=@" << (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"; + v << "WALLCHOPS WALLVOICES MODES=" << Config->Limits.MaxModes - 1 << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << Config->MaxChans << " MAXBANS=60 VBANLIST NICKLEN=" << Config->Limits.NickMax - 1; + v << " CASEMAPPING=rfc1459 STATUSMSG=@" << (this->Config->AllowHalfop ? "%" : "") << "+ CHARSET=ascii TOPICLEN=" << Config->Limits.MaxTopic - 1 << " KICKLEN=" << Config->Limits.MaxKick - 1 << " MAXTARGETS=" << Config->MaxTargets - 1; + v << " AWAYLEN=" << Config->Limits.MaxAway - 1 << " CHANMODES=" << this->Modes->GiveModeList(MASK_CHANNEL) << " FNC NETWORK=" << Config->Network << " MAXPARA=32 ELIST=MU"; Config->data005 = v.str(); - FOREACH_MOD_I(this,I_On005Numeric,On005Numeric(Config->data005)); + FOREACH_MOD(I_On005Numeric,On005Numeric(Config->data005)); Config->Update005(); } @@ -136,74 +128,99 @@ bool InspIRCd::FindServerName(const std::string &servername) return false; } +void InspIRCd::IncrementUID(int pos) +{ + /* + * Okay. The rules for generating a UID go like this... + * -- > ABCDEFGHIJKLMNOPQRSTUVWXYZ --> 012345679 --> WRAP + * That is, we start at A. When we reach Z, we go to 0. At 9, we go to + * A again, in an iterative fashion.. so.. + * AAA9 -> AABA, and so on. -- w00t + */ + if (pos == 3) + { + // At pos 3, if we hit '9', we've run out of available UIDs, and need to reset to AAA..AAA. + if (current_uid[pos] == '9') + { + for (int i = 3; i < UUID_LENGTH; i++) + { + current_uid[i] = 'A'; + pos = UUID_LENGTH - 1; + } + } + else + { + // Buf if we haven't, just keep incrementing merrily. + current_uid[pos]++; + } + } + else + { + // If we hit Z, wrap around to 0. + if (current_uid[pos] == 'Z') + { + current_uid[pos] = '0'; + } + else if (current_uid[pos] == '9') + { + /* + * Or, if we hit 9, wrap around to pos = 'A' and (pos - 1)++, + * e.g. A9 -> BA -> BB .. + */ + current_uid[pos] = 'A'; + this->IncrementUID(pos - 1); + } + else + { + // Anything else, nobody gives a shit. Just increment. + current_uid[pos]++; + } + } +} + /* * Retrieve the next valid UUID that is free for this server. */ std::string InspIRCd::GetUID() { - int i; + static int curindex = -1; /* - * This will only finish once we return a UUID that is not in use. + * If -1, 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 */ - while (1) + if (curindex == -1) { - /* - * Okay. The rules for generating a UID go like this... - * -- > ABCDEFGHIJKLMNOPQRSTUVWXYZ --> 012345679 --> WRAP - * That is, we start at A. When we reach Z, we go to 0. At 9, we go to - * A again, in an iterative fashion.. so.. - * AAA9 -> AABA, and so on. -- w00t - */ - - /* start at the end of the current UID string, work backwards. don't trample on SID! */ - for (i = UUID_LENGTH - 2; i > 3; i--) - { - if (current_uid[i] == 'Z') - { - /* reached the end of alphabetical, go to numeric range */ - current_uid[i] = '0'; - } - else if (current_uid[i] == '9') - { - /* we reached the end of the sequence, set back to A */ - current_uid[i] = 'A'; + current_uid[0] = Config->sid[0]; + current_uid[1] = Config->sid[1]; + current_uid[2] = Config->sid[2]; - /* we also need to increment the next digit. */ - continue; - } - else - { - /* most common case .. increment current UID */ - current_uid[i]++; - } + for (int i = 3; i < (UUID_LENGTH - 1); i++) + current_uid[i] = '9'; - if (current_uid[3] == 'Z') - { - /* - * Ugh. We have run out of room.. roll back around to the - * start of the UUID namespace. -- w00t - */ - this->InitialiseUID(); - - /* - * and now we need to break the inner for () to continue the while (), - * which will start the checking process over again. -- w00t - */ - break; - - } - - if (this->FindUUID(current_uid)) - { - /* - * It's in use. We need to try the loop again. - */ - continue; - } + curindex = UUID_LENGTH - 2; // look at the end of the string now kthx, ignore null + + // Null terminator. Important. + current_uid[UUID_LENGTH - 1] = '\0'; + } - return current_uid; + while (1) + { + // Add one to the last UID + this->IncrementUID(curindex); + + if (this->FindUUID(current_uid)) + { + /* + * It's in use. We need to try the loop again. + */ + continue; } + + return current_uid; } /* not reached. */