* ---------------------------------------------------
*/
-/* $Core: libIRCDserver */
+/* $Core */
#include <signal.h>
#include "exitcodes.h"
switch (signal)
{
case SIGHUP:
- Rehash();
+ Rehash("due to SIGHUP");
break;
case SIGTERM:
Exit(signal);
void InspIRCd::Exit(int status)
{
#ifdef WINDOWS
- delete WindowsIPC;
+ if (WindowsIPC)
+ delete WindowsIPC;
+ SetServiceStopped(status);
#endif
if (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)
+ 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)
{
- Config->RehashUser = NULL;
- Config->RehashParameter = "";
+ Server->Config->RehashUserUID = "";
+ Server->Config->RehashParameter = "";
- ConfigThread = new ConfigReaderThread(this, false, NULL);
- Threads->Create(ConfigThread);
+ Server->ConfigThread = new ConfigReaderThread(Server, false, "");
+ Server->Threads->Create(Server->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()
char versiondata[MAXBUF];
if (*Config->CustomVersion)
{
- snprintf(versiondata,MAXBUF,"%s %s :%s",VERSION,Config->ServerName,Config->CustomVersion);
+ snprintf(versiondata,MAXBUF,"InspIRCd-1.2 %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-1.2 %s :%s (%s) [FLAGS=%s,%s,%s]",Config->ServerName,SYSTEM,VERSION,REVISION,SE->GetName().c_str(),Config->sid);
}
return versiondata;
}
{
// 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 << " 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->ChanModes() << " FNC NETWORK=" << Config->Network << " MAXPARA=32 ELIST=MU";
Config->data005 = v.str();
FOREACH_MOD_I(this,I_On005Numeric,On005Numeric(Config->data005));
Config->Update005();