* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * Inspire is copyright (C) 2002-2004 ChatSpike-Dev.
+ * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
* E-mail:
* <brain@chatspike.net>
* <Craig@chatspike.net>
#include "inspircd_io.h"
#include "inspstring.h"
#include "helperfuncs.h"
+#include "userprocess.h"
#include "xline.h"
extern ServerConfig *Config;
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';
- *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0';
- *ModPath = *MyExecutable = *DisabledCommands = *PID = '\0';
+ *CustomVersion = *motd = *rules = *PrefixQuit = *DieValue = *DNSServer = '\0';
+ *OperOnlyStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = '\0';
log_file = NULL;
nofork = false;
unlimitcore = false;
return false;
}
+bool ServerConfig::CheckOnce(char* tag, bool bail, userrec* user)
+{
+ int count = ConfValueEnum(tag,&Config->config_f);
+ if (count > 1)
+ {
+ if (bail)
+ {
+ printf("There were errors in your configuration:\nYou have more than one <%s> tag, this is not permitted.\n",tag);
+ Exit(0);
+ }
+ else
+ {
+ if (user)
+ {
+ WriteServ(user->fd,"There were errors in your configuration:");
+ WriteServ(user->fd,"You have more than one <%s> tag, this is not permitted.\n",tag);
+ }
+ else
+ {
+ WriteOpers("There were errors in the configuration file:");
+ WriteOpers("You have more than one <%s> tag, this is not permitted.\n",tag);
+ }
+ }
+ return false;
+ }
+ if (count < 1)
+ {
+ if (bail)
+ {
+ printf("There were errors in your configuration:\nYou have not defined a <%s> tag, this is required.",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];
}
}
+ /* Check we dont have more than one of singular tags
+ */
+ 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("server","name",0,Config->ServerName,&Config->config_f);
ConfValue("server","description",0,Config->ServerDesc,&Config->config_f);
ConfValue("server","network",0,Config->Network,&Config->config_f);
ConfValue("disabled","commands",0,Config->DisabledCommands,&Config->config_f);
ConfValue("options","somaxconn",0,MCON,&Config->config_f);
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);
Config->SoftLimit = atoi(SLIMT);
if ((Config->SoftLimit < 1) || (Config->SoftLimit > MAXCLIENTS))
Classes.clear();
for (int i = 0; i < ConfValueEnum("connect",&Config->config_f); i++)
{
- strcpy(Value,"");
+ *Value = 0;
ConfValue("connect","allow",i,Value,&Config->config_f);
ConfValue("connect","timeout",i,timeout,&Config->config_f);
ConfValue("connect","flood",i,flood,&Config->config_f);
ConfValue("connect","recvq",i,rqmax,&Config->config_f);
if (*Value)
{
- strlcpy(c.host,Value,MAXBUF);
+ c.host = Value;
c.type = CC_ALLOW;
strlcpy(Value,"",MAXBUF);
ConfValue("connect","password",i,Value,&Config->config_f);
- strlcpy(c.pass,Value,MAXBUF);
+ c.pass = Value;
c.registration_timeout = 90; // default is 2 minutes
c.pingtime = 120;
c.flood = atoi(flood);
else
{
ConfValue("connect","deny",i,Value,&Config->config_f);
- strlcpy(c.host,Value,MAXBUF);
+ c.host = Value;
c.type = CC_DENY;
Classes.push_back(c);
- log(DEBUG,"Read connect class type DENY, host=%s",c.host);
+ log(DEBUG,"Read connect class type DENY, host=%s",c.host.c_str());
}
}
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(""));
}
}
}
-
-int DaemonSeed (void)
+void SetSignals()
{
- int childpid;
signal (SIGALRM, SIG_IGN);
signal (SIGHUP, Rehash);
signal (SIGPIPE, SIG_IGN);
signal (SIGTERM, Exit);
signal (SIGSEGV, Error);
+}
+
+
+int DaemonSeed (void)
+{
+ int childpid;
if ((childpid = fork ()) < 0)
return (ERROR);
else if (childpid > 0)
}
snprintf(newconf,10240,"%s/%s",confpath,buf);
}
- else snprintf(newconf,10240,"%s",buf);
+ else strlcpy(newconf,buf,10240);
std::stringstream merge(stringstream::in | stringstream::out);
// recursively call LoadConf and get the new data, use the same errorstream
if (LoadConf(newconf, &merge, errorstream))
if (!key)
{
/* value not found in tag */
- strcpy(result,"");
+ *result = 0;
return 0;
}
else
if (!*key)
{
/* missing quote */
- strcpy(result,"");
+ *result = 0;
return 0;
}
key++;
}
}
}
- strcpy(result,""); // value or its tag not found at all
+ *result = 0; // value or its tag not found at all
return 0;
}
projects / user / henk / code / inspircd.git / blobdiff