* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * InspIRCd: (C) 2002-2010 InspIRCd Development Team
* See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* ---------------------------------------------------
*/
-/* $Core */
-
#include <signal.h>
#include "exitcodes.h"
#include "inspircd.h"
-
+#include "inspircd_version.h"
void InspIRCd::SignalHandler(int signal)
{
- switch (signal)
+ if (signal == SIGHUP)
+ {
+ Rehash("Caught SIGHUP");
+ }
+ else if (signal == SIGTERM)
{
- case SIGHUP:
- Rehash("due to SIGHUP");
- break;
- case SIGTERM:
- Exit(signal);
- break;
+ Exit(signal);
}
}
{
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 << " CHANTYPES=# PREFIX=" << this->Modes->BuildPrefixes() << " MAP MAXCHANNELS=" << Config->MaxChans << " MAXBANS=60 VBANLIST NICKLEN=" << Config->Limits.NickMax;
- v << " CASEMAPPING=rfc1459 STATUSMSG=@" << (this->Config->AllowHalfop ? "%" : "") << "+ 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";
+ 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=" << Modes->BuildPrefixes(false) << " 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();
}
-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)
{
/*
// 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;