extern int openSockfd[MAXSOCKS];
extern time_t TIME;
+extern int MODCOUNT;
+extern std::vector<Module*> modules;
+extern std::vector<ircd_module*> factory;
ServerConfig::ServerConfig()
{
this->ClearStack();
- *ServerName = *Network = *ServerDesc = *AdminName = '\0';
- *AdminEmail = *AdminNick = *diepass = *restartpass = '\0';
+ *TempDir = *ServerName = *Network = *ServerDesc = *AdminName = '\0';
+ *HideWhoisServer = *AdminEmail = *AdminNick = *diepass = *restartpass = '\0';
*CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0';
*OperOnlyStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = '\0';
log_file = NULL;
nofork = false;
unlimitcore = false;
AllowHalfop = true;
+ HideSplits = false;
dns_timeout = 5;
+ MaxTargets = 20;
NetBufferSize = 10240;
SoftLimit = MAXCLIENTS;
MaxConn = SOMAXCONN;
return false;
}
-bool ServerConfig::CheckOnce(char* tag,bool bail)
+bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user)
{
- if (ConfValueEnum(tag,&Config->config_f) > 1)
+ int count = ConfValueEnum(tag,&Config->config_f);
+ if (count > 1)
{
if (bail)
{
}
return false;
}
+ if (count < 1)
+ {
+ if (bail)
+ {
+ printf("There were errors in your configuration:\nYou have not defined a <%s> tag, this is required.\n",tag);
+ Exit(0);
+ }
+ else
+ {
+ if (user)
+ {
+ WriteServ(user->fd,"There were errors in your configuration:");
+ WriteServ(user->fd,"You have not defined a <%s> tag, this is required.",tag);
+ }
+ else
+ {
+ WriteOpers("There were errors in the configuration file:");
+ WriteOpers("You have not defined a <%s> tag, this is required.",tag);
+ }
+ }
+ return false;
+ }
return true;
}
void ServerConfig::Read(bool bail, userrec* user)
{
- char dbg[MAXBUF],pauseval[MAXBUF],Value[MAXBUF],timeout[MAXBUF],NB[MAXBUF],flood[MAXBUF],MW[MAXBUF],MCON[MAXBUF];
+ char dbg[MAXBUF],pauseval[MAXBUF],Value[MAXBUF],timeout[MAXBUF],NB[MAXBUF],flood[MAXBUF],MW[MAXBUF],MCON[MAXBUF],MT[MAXBUF];
char AH[MAXBUF],AP[MAXBUF],AF[MAXBUF],DNT[MAXBUF],pfreq[MAXBUF],thold[MAXBUF],sqmax[MAXBUF],rqmax[MAXBUF],SLIMT[MAXBUF];
+ char localmax[MAXBUF],globalmax[MAXBUF],HS[MAXBUF];
ConnectClass c;
std::stringstream errstr;
include_stack.clear();
/* Check we dont have more than one of singular tags
*/
- if (!CheckOnce("server") || !CheckOnce("admin") || !CheckOnce("files") || !CheckOnce("power") || !CheckOnce("options")
- || !CheckOnce("dns") || !CheckOnce("options") || !CheckOnce("disabled") || !CheckOnce("pid"))
+ if (!CheckOnce("server",bail,user) || !CheckOnce("admin",bail,user) || !CheckOnce("files",bail,user)
+ || !CheckOnce("power",bail,user) || !CheckOnce("options",bail,user)
+ || !CheckOnce("dns",bail,user) || !CheckOnce("pid",bail,user))
{
return;
}
ConfValue("options","softlimit",0,SLIMT,&Config->config_f);
ConfValue("options","operonlystats",0,Config->OperOnlyStats,&Config->config_f);
ConfValue("options","customversion",0,Config->CustomVersion,&Config->config_f);
-
+ ConfValue("options","maxtargets",0,MT,&Config->config_f);
+ ConfValue("options","hidesplits",0,HS,&Config->config_f);
+ ConfValue("options","hidewhois",0,Config->HideWhoisServer,&Config->config_f);
+ ConfValue("options","tempdir",0,Config->TempDir,&Config->config_f);
+
+ if (!*Config->TempDir)
+ strlcpy(Config->TempDir,"/tmp",1024);
+ Config->HideSplits = ((*HS == 'y') || (*HS == 'Y') || (*HS == '1') || (*HS == 't') || (*HS == 'T'));
Config->SoftLimit = atoi(SLIMT);
+ if (*MT)
+ Config->MaxTargets = atoi(MT);
+ if ((Config->MaxTargets < 0) || (Config->MaxTargets > 31))
+ {
+ log(DEFAULT,"WARNING: <options:maxtargets> value is greater than 31 or less than 0, set to 20.");
+ Config->MaxTargets = 20;
+ }
if ((Config->SoftLimit < 1) || (Config->SoftLimit > MAXCLIENTS))
{
log(DEFAULT,"WARNING: <options:softlimit> value is greater than %d or less than 0, set to %d.",MAXCLIENTS,MAXCLIENTS);
ConfValue("connect","threshold",i,thold,&Config->config_f);
ConfValue("connect","sendq",i,sqmax,&Config->config_f);
ConfValue("connect","recvq",i,rqmax,&Config->config_f);
+ ConfValue("connect","localmax",i,localmax,&Config->config_f);
+ ConfValue("connect","globalmax",i,globalmax,&Config->config_f);
if (*Value)
{
c.host = Value;
c.threshold = 5;
c.sendqmax = 262144; // 256k
c.recvqmax = 4096; // 4k
+ c.maxlocal = 3;
+ c.maxglobal = 3;
+ if (atoi(localmax)>0)
+ {
+ c.maxlocal = atoi(localmax);
+ }
+ if (atoi(globalmax)>0)
+ {
+ c.maxglobal = atoi(globalmax);
+ }
if (atoi(thold)>0)
{
c.threshold = atoi(thold);
if (ServerInstance->UnloadModule(removing->c_str()))
{
WriteOpers("*** REHASH UNLOADED MODULE: %s",removing->c_str());
- WriteServ(user->fd,"973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str());
+ if (user)
+ WriteServ(user->fd,"973 %s %s :Module %s successfully unloaded.",user->nick, removing->c_str(), removing->c_str());
rem++;
}
else
{
- WriteServ(user->fd,"972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->ModuleError());
+ if (user)
+ WriteServ(user->fd,"972 %s %s :Failed to unload module %s: %s",user->nick, removing->c_str(), removing->c_str(), ServerInstance->ModuleError());
}
}
if (!added_modules.empty())
if (ServerInstance->LoadModule(adding->c_str()))
{
WriteOpers("*** REHASH LOADED MODULE: %s",adding->c_str());
- WriteServ(user->fd,"975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str());
+ if (user)
+ WriteServ(user->fd,"975 %s %s :Module %s successfully loaded.",user->nick, adding->c_str(), adding->c_str());
add++;
}
else
{
- WriteServ(user->fd,"974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->ModuleError());
+ if (user)
+ WriteServ(user->fd,"974 %s %s :Failed to load module %s: %s",user->nick, adding->c_str(), adding->c_str(), ServerInstance->ModuleError());
}
}
log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules.",(unsigned long)rem,(unsigned long)removed_modules.size(),
exit(status);
}
+char* CleanFilename(char* name)
+{
+ char* p = name + strlen(name);
+ while ((p != name) && (*p != '/')) p--;
+ return (p != name ? ++p : p);
+}
+
+
void Rehash(int status)
{
- WriteOpers("Rehashing config file %s due to SIGHUP",CONFIG_FILE);
+ WriteOpers("Rehashing config file %s due to SIGHUP",CleanFilename(CONFIG_FILE));
fclose(Config->log_file);
OpenLog(NULL,0);
Config->Read(false,NULL);
+ FOREACH_MOD(I_OnRehash,OnRehash(""));
}
break;
}
}
- log(DEFAULT,"Opening included file '%s'",buf);
+ log(DEBUG,"Opening included file '%s'",buf);
if (*buf != '/')
{
strlcpy(confpath,CONFIG_FILE,10240);
Config->ConfValue("bind","port",count,configToken,&Config->config_f);
Config->ConfValue("bind","address",count,Addr,&Config->config_f);
Config->ConfValue("bind","type",count,Type,&Config->config_f);
- if (strcmp(Type,"servers"))
+ if ((!*Type) || (!strcmp(Type,"clients")))
{
// modules handle server bind types now,
// its not a typo in the strcmp.
projects / user / henk / code / inspircd.git / blobdiff