X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fserver.cpp;h=dab920bb6f8daefde2eccc6e9c75fe35de3dafd8;hb=196b9a9fb6878bdf686ab4e3bbdef2d1c26fe366;hp=c5223561a4ee18d6e274b0e597a392e5904761ea;hpb=d1188236f2e731b0a6d59bb2abaa218d5dc8fd60;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/server.cpp b/src/server.cpp index c5223561a..dab920bb6 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -1,34 +1,39 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon + * + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2008 Craig Edwards + * Copyright (C) 2007-2008 Robin Burchell + * Copyright (C) 2007 Dennis Friis * - * InspIRCd: (C) 2002-2009 InspIRCd Development Team - * See: http://wiki.inspircd.org/Credits + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. * - * --------------------------------------------------- + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ -/* $Core */ #include #include "exitcodes.h" #include "inspircd.h" #include "inspircd_version.h" - void InspIRCd::SignalHandler(int signal) { - switch (signal) + if (signal == SIGHUP) { - case SIGHUP: - Rehash("due to SIGHUP"); - break; - case SIGTERM: - Exit(signal); - break; + Rehash("Caught SIGHUP"); + } + else if (signal == SIGTERM) + { + Exit(signal); } } @@ -43,90 +48,50 @@ void InspIRCd::Exit(int status) { this->SendError("Exiting with status " + ConvToStr(status) + " (" + std::string(ExitCodes[status]) + ")"); this->Cleanup(); + delete this; + ServerInstance = NULL; } exit (status); } void RehashHandler::Call(const std::string &reason) { - Server->SNO->WriteToSnoMask('a', "Rehashing config file %s %s",ServerConfig::CleanFilename(Server->ConfigFileName), reason.c_str()); - Server->RehashUsersAndChans(); - FOREACH_MOD_I(Server, I_OnGarbageCollect, OnGarbageCollect()); - if (!Server->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) { - Server->ConfigThread = new ConfigReaderThread(Server, ""); - Server->Threads->Start(Server->ConfigThread); + ServerInstance->ConfigThread = new ConfigReaderThread(""); + ServerInstance->Threads->Start(ServerInstance->ConfigThread); } } -void InspIRCd::RehashServer() -{ - this->Rehash(""); -} - -std::string InspIRCd::GetVersionString() +std::string InspIRCd::GetVersionString(bool operstring) { char versiondata[MAXBUF]; - if (*Config->CustomVersion) - { - snprintf(versiondata,MAXBUF,"InspIRCd-1.2 %s :%s",Config->ServerName,Config->CustomVersion); - } + if (operstring) + snprintf(versiondata,MAXBUF,"%s %s :%s [%s,%s,%s]",VERSION,Config->ServerName.c_str(),SYSTEM,REVISION,SE->GetName().c_str(),Config->sid.c_str()); else - { - snprintf(versiondata,MAXBUF,"InspIRCd-1.2 %s :%s (%s) [FLAGS=%s,%s,%s]",Config->ServerName,SYSTEM,VERSION,REVISION,SE->GetName().c_str(),Config->sid); - } + snprintf(versiondata,MAXBUF,"InspIRCd-2.0 %s :%s",Config->ServerName.c_str(),Config->CustomVersion.c_str()); return versiondata; } +const char InspIRCd::LogHeader[] = + "Log started for " VERSION " (" REVISION ", " MODULE_INIT_STR ")" + " - compiled on " SYSTEM; + 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=" << 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"; + v << "WALLCHOPS WALLVOICES MODES=" << Config->Limits.MaxModes << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << Config->MaxChans << " MAXBANS=60 VBANLIST NICKLEN=" << Config->Limits.NickMax; + v << " CASEMAPPING=rfc1459 STATUSMSG=" << Modes->BuildPrefixes(false) << " CHARSET=ascii TOPICLEN=" << Config->Limits.MaxTopic << " KICKLEN=" << Config->Limits.MaxKick << " MAXTARGETS=" << Config->MaxTargets; + v << " AWAYLEN=" << Config->Limits.MaxAway << " 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(); } -std::string InspIRCd::GetRevision() -{ - return REVISION; -} - -void InspIRCd::AddServerName(const std::string &servername) -{ - servernamelist::iterator itr = servernames.begin(); - for(; itr != servernames.end(); ++itr) - if(**itr == servername) - return; - - std::string * ns = new std::string(servername); - servernames.push_back(ns); -} - -const char* InspIRCd::FindServerNamePtr(const std::string &servername) -{ - servernamelist::iterator itr = servernames.begin(); - for(; itr != servernames.end(); ++itr) - if(**itr == servername) - return (*itr)->c_str(); - - servernames.push_back(new std::string(servername)); - itr = --servernames.end(); - return (*itr)->c_str(); -} - -bool InspIRCd::FindServerName(const std::string &servername) -{ - servernamelist::iterator itr = servernames.begin(); - for(; itr != servernames.end(); ++itr) - if(**itr == servername) - return true; - return false; -} - void InspIRCd::IncrementUID(int pos) { /* @@ -141,10 +106,9 @@ void InspIRCd::IncrementUID(int pos) // 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++) + for (int i = 3; i < (UUID_LENGTH - 1); i++) { current_uid[i] = 'A'; - pos = UUID_LENGTH - 1; } } else