X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fserver.cpp;h=4814852c499bfc31f570108eb6ed0b50a4b76fe6;hb=20680f9c4964a5e10e3649a1e479078ff85c5c85;hp=2ab452fc8cb50f401d1370cb8e3d80492c342565;hpb=77b0de3fedf130ce0d3b50bb2a2e8d98dcf5d3f4;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/server.cpp b/src/server.cpp index 2ab452fc8..4814852c4 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -2,54 +2,87 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * InspIRCd: (C) 2002-2008 InspIRCd Development Team * See: http://www.inspircd.org/wiki/index.php/Credits * * This program is free but copyrighted software; see - * the file COPYING for details. + * the file COPYING for details. * * --------------------------------------------------- */ +/* $Core: libIRCDserver */ + +#include +#include "exitcodes.h" #include "inspircd.h" -void InspIRCd::Rehash(int status) + +void InspIRCd::SignalHandler(int signal) { -/* - SI->WriteOpers("*** Rehashing config file %s due to SIGHUP",ServerConfig::CleanFilename(SI->ConfigFileName)); - SI->CloseLog(); - SI->OpenLog(SI->Config->argv, SI->Config->argc); - SI->RehashUsersAndChans(); - FOREACH_MOD_I(SI, I_OnGarbageCollect, OnGarbageCollect()); - SI->Config->Read(false,NULL); - SI->ResetMaxBans(); - SI->Res->Rehash(); - FOREACH_MOD_I(SI,I_OnRehash,OnRehash(NULL,"")); - SI->BuildISupport(); -*/ + switch (signal) + { + case SIGHUP: + Rehash(); + break; + case SIGTERM: + Exit(signal); + break; + } +} + +void InspIRCd::Exit(int status) +{ +#ifdef WINDOWS + delete WindowsIPC; +#endif + if (this) + { + this->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")"); + this->Cleanup(); + } + exit (status); +} + +void InspIRCd::Rehash() +{ + 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) + { + Config->RehashUser = NULL; + Config->RehashParameter = ""; + + ConfigThread = new ConfigReaderThread(this, false, NULL); + Threads->Create(ConfigThread); + } } void InspIRCd::RehashServer() { - this->WriteOpers("*** Rehashing config file"); + this->SNO->WriteToSnoMask('A', "Rehashing config file"); this->RehashUsersAndChans(); - this->Config->Read(false,NULL); - this->ResetMaxBans(); - this->Res->Rehash(); + if (!this->ConfigThread) + { + Config->RehashUser = NULL; + Config->RehashParameter = ""; + + ConfigThread = new ConfigReaderThread(this, false, NULL); + Threads->Create(ConfigThread); + } } std::string InspIRCd::GetVersionString() { char versiondata[MAXBUF]; - char dnsengine[] = "singlethread-object"; - if (*Config->CustomVersion) { snprintf(versiondata,MAXBUF,"%s %s :%s",VERSION,Config->ServerName,Config->CustomVersion); } else { - snprintf(versiondata,MAXBUF,"%s %s :%s [FLAGS=%s,%s,%s]",VERSION,Config->ServerName,SYSTEM,REVISION,SE->GetName().c_str(),dnsengine); + snprintf(versiondata,MAXBUF,"%s %s :%s [FLAGS=%s,%s,%s]",VERSION,Config->ServerName,SYSTEM,REVISION,SE->GetName().c_str(),Config->sid); } return versiondata; } @@ -58,9 +91,9 @@ 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-1 << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << Config->MaxChans << " MAXBANS=60 VBANLIST NICKLEN=" << NICKMAX-1; - v << " CASEMAPPING=rfc1459 STATUSMSG=@%+ CHARSET=ascii TOPICLEN=" << MAXTOPIC << " KICKLEN=" << MAXKICK << " MAXTARGETS=" << Config->MaxTargets << " AWAYLEN="; - v << MAXAWAY << " CHANMODES=" << this->Modes->ChanModes() << " FNC NETWORK=" << Config->Network << " MAXPARA=32 ELIST=MU"; + 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"; Config->data005 = v.str(); FOREACH_MOD_I(this,I_On005Numeric,On005Numeric(Config->data005)); Config->Update005(); @@ -78,7 +111,7 @@ void InspIRCd::AddServerName(const std::string &servername) if(**itr == servername) return; - string * ns = new string(servername); + std::string * ns = new std::string(servername); servernames.push_back(ns); } @@ -89,7 +122,7 @@ const char* InspIRCd::FindServerNamePtr(const std::string &servername) if(**itr == servername) return (*itr)->c_str(); - servernames.push_back(new string(servername)); + servernames.push_back(new std::string(servername)); itr = --servernames.end(); return (*itr)->c_str(); } @@ -103,3 +136,79 @@ bool InspIRCd::FindServerName(const std::string &servername) return false; } +/* + * Retrieve the next valid UUID that is free for this server. + */ +std::string InspIRCd::GetUID() +{ + int i; + + /* + * This will only finish once we return a UUID that is not in use. + */ + while (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'; + + /* we also need to increment the next digit. */ + continue; + } + else + { + /* most common case .. increment current UID */ + current_uid[i]++; + } + + 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; + } + + return current_uid; + } + } + + /* not reached. */ + return ""; +} + + +