* ---------------------------------------------------
*/
-#include "inspircd_config.h"
#include "configreader.h"
-#include <string>
#include <sstream>
-#include <iostream>
#include <fstream>
#include "inspircd.h"
-#include "inspstring.h"
-#include "helperfuncs.h"
-#include "userprocess.h"
#include "xline.h"
-extern time_t TIME;
-
-extern int MODCOUNT;
-extern std::vector<Module*> modules;
-extern std::vector<ircd_module*> factory;
-
-using irc::sockets::BindPorts;
-
std::vector<std::string> old_module_names, new_module_names, added_modules, removed_modules;
ServerConfig::ServerConfig(InspIRCd* Instance) : ServerInstance(Instance)
*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';
+ *UserStats = *ModPath = *MyExecutable = *DisabledCommands = *PID = '\0';
log_file = NULL;
NoUserDns = forcedebug = OperSpyWhois = nofork = HideBans = HideSplits = false;
- writelog = AllowHalfop = true;
+ CycleHosts = writelog = AllowHalfop = true;
dns_timeout = DieDelay = 5;
MaxTargets = 20;
NetBufferSize = 10240;
if (bail)
{
printf("There were errors in your configuration:\nYou have more than one <%s> tag, this is not permitted.\n",tag);
- Exit(0);
+ InspIRCd::Exit(ERROR);
}
else
{
if (bail)
{
printf("There were errors in your configuration:\nYou have not defined a <%s> tag, this is required.\n",tag);
- Exit(0);
+ InspIRCd::Exit(ERROR);
}
else
{
bool NoValidation(ServerConfig* conf, const char* tag, const char* value, void* data)
{
- log(DEBUG,"No validation for <%s:%s>",tag,value);
+ conf->GetInstance()->Log(DEBUG,"No validation for <%s:%s>",tag,value);
return true;
}
int* x = (int*)data;
if ((*x < 0) || (*x > 31))
{
- log(DEFAULT,"WARNING: <options:maxtargets> value is greater than 31 or less than 0, set to 20.");
+ conf->GetInstance()->Log(DEFAULT,"WARNING: <options:maxtargets> value is greater than 31 or less than 0, set to 20.");
*x = 20;
}
return true;
int* x = (int*)data;
if ((*x < 1) || (*x > MAXCLIENTS))
{
- log(DEFAULT,"WARNING: <options:softlimit> value is greater than %d or less than 0, set to %d.",MAXCLIENTS,MAXCLIENTS);
+ conf->GetInstance()->Log(DEFAULT,"WARNING: <options:softlimit> value is greater than %d or less than 0, set to %d.",MAXCLIENTS,MAXCLIENTS);
*x = MAXCLIENTS;
}
return true;
{
int* x = (int*)data;
if (*x > SOMAXCONN)
- log(DEFAULT,"WARNING: <options:somaxconn> value may be higher than the system-defined SOMAXCONN value!");
+ conf->GetInstance()->Log(DEFAULT,"WARNING: <options:somaxconn> value may be higher than the system-defined SOMAXCONN value!");
if (!*x)
*x = SOMAXCONN;
return true;
nspace::hash_map<std::string,command_t*>::iterator cm = ServerInstance->Parser->cmdlist.find(thiscmd);
if (cm != ServerInstance->Parser->cmdlist.end())
{
- log(DEBUG,"Disabling command '%s'",cm->second->command.c_str());
+ ServerInstance->Log(DEBUG,"Disabling command '%s'",cm->second->command.c_str());
cm->second->Disable(true);
}
}
if (!*x)
{
// attempt to look up their nameserver from /etc/resolv.conf
- log(DEFAULT,"WARNING: <dns:server> not defined, attempting to find working server in /etc/resolv.conf...");
+ conf->GetInstance()->Log(DEFAULT,"WARNING: <dns:server> not defined, attempting to find working server in /etc/resolv.conf...");
ifstream resolv("/etc/resolv.conf");
std::string nameserver;
bool found_server = false;
resolv >> nameserver;
strlcpy(x,nameserver.c_str(),MAXBUF);
found_server = true;
- log(DEFAULT,"<dns:server> set to '%s' as first resolver in /etc/resolv.conf.",nameserver.c_str());
+ conf->GetInstance()->Log(DEFAULT,"<dns:server> set to '%s' as first resolver in /etc/resolv.conf.",nameserver.c_str());
}
}
if (!found_server)
{
- log(DEFAULT,"/etc/resolv.conf contains no viable nameserver entries! Defaulting to nameserver '127.0.0.1'!");
+ conf->GetInstance()->Log(DEFAULT,"/etc/resolv.conf contains no viable nameserver entries! Defaulting to nameserver '127.0.0.1'!");
strlcpy(x,"127.0.0.1",MAXBUF);
}
}
else
{
- log(DEFAULT,"/etc/resolv.conf can't be opened! Defaulting to nameserver '127.0.0.1'!");
+ conf->GetInstance()->Log(DEFAULT,"/etc/resolv.conf can't be opened! Defaulting to nameserver '127.0.0.1'!");
strlcpy(x,"127.0.0.1",MAXBUF);
}
}
char* x = (char*)data;
if (!strchr(x,'.'))
{
- log(DEFAULT,"WARNING: <server:name> '%s' is not a fully-qualified domain name. Changed to '%s%c'",x,x,'.');
+ conf->GetInstance()->Log(DEFAULT,"WARNING: <server:name> '%s' is not a fully-qualified domain name. Changed to '%s%c'",x,x,'.');
charlcat(x,'.',MAXBUF);
}
//strlower(x);
{
if ((!conf->NetBufferSize) || (conf->NetBufferSize > 65535) || (conf->NetBufferSize < 1024))
{
- log(DEFAULT,"No NetBufferSize specified or size out of range, setting to default of 10240.");
+ conf->GetInstance()->Log(DEFAULT,"No NetBufferSize specified or size out of range, setting to default of 10240.");
conf->NetBufferSize = 10240;
}
return true;
{
if ((!conf->MaxWhoResults) || (conf->MaxWhoResults > 65535) || (conf->MaxWhoResults < 1))
{
- log(DEFAULT,"No MaxWhoResults specified or size out of range, setting to default of 128.");
+ conf->GetInstance()->Log(DEFAULT,"No MaxWhoResults specified or size out of range, setting to default of 128.");
conf->MaxWhoResults = 128;
}
return true;
*/
bool InitConnect(ServerConfig* conf, const char* tag)
{
- log(DEFAULT,"Reading connect classes...");
+ conf->GetInstance()->Log(DEFAULT,"Reading connect classes...");
conf->Classes.clear();
return true;
}
{
c.threshold = 1;
c.flood = 999;
- log(DEFAULT,"Warning: Connect allow line '%s' has no flood/threshold settings. Setting this tag to 999 lines in 1 second.",c.host.c_str());
+ conf->GetInstance()->Log(DEFAULT,"Warning: Connect allow line '%s' has no flood/threshold settings. Setting this tag to 999 lines in 1 second.",c.host.c_str());
}
if (c.sendqmax == 0)
c.sendqmax = 262114;
c.host = deny;
c.type = CC_DENY;
conf->Classes.push_back(c);
- log(DEBUG,"Read connect class type DENY, host=%s",deny);
+ conf->GetInstance()->Log(DEBUG,"Read connect class type DENY, host=%s",deny);
}
return true;
*/
bool DoneConnect(ServerConfig* conf, const char* tag)
{
- log(DEBUG,"DoneConnect called for tag: %s",tag);
+ conf->GetInstance()->Log(DEBUG,"DoneConnect called for tag: %s",tag);
return true;
}
bool DoULine(ServerConfig* conf, const char* tag, char** entries, void** values, int* types)
{
char* server = (char*)values[0];
- log(DEBUG,"Read ULINE '%s'",server);
+ conf->GetInstance()->Log(DEBUG,"Read ULINE '%s'",server);
conf->ulines.push_back(server);
return true;
}
std::ostringstream errstr; /* String stream containing the error output */
/* These tags MUST occur and must ONLY occur once in the config file */
- static char* Once[] = { "server", "admin", "files", "power", "options", "pid", NULL };
+ static char* Once[] = { "server", "admin", "files", "power", "options", NULL };
/* These tags can occur ONCE or not at all */
static InitialConfig Values[] = {
{"files", "motd", &this->motd, DT_CHARPTR, ValidateMotd},
{"files", "rules", &this->rules, DT_CHARPTR, ValidateRules},
{"power", "diepass", &this->diepass, DT_CHARPTR, NoValidation},
- {"power", "pauseval", &this->DieDelay, DT_INTEGER, NoValidation},
+ {"power", "pause", &this->DieDelay, DT_INTEGER, NoValidation},
{"power", "restartpass", &this->restartpass, DT_CHARPTR, NoValidation},
{"options", "prefixquit", &this->PrefixQuit, DT_CHARPTR, NoValidation},
{"die", "value", &this->DieValue, DT_CHARPTR, NoValidation},
{"dns", "timeout", &this->dns_timeout, DT_INTEGER, ValidateDnsTimeout},
{"options", "moduledir", &this->ModPath, DT_CHARPTR, ValidateModPath},
{"disabled", "commands", &this->DisabledCommands, DT_CHARPTR, NoValidation},
- {"options", "operonlystats", &this->OperOnlyStats, DT_CHARPTR, NoValidation},
+ {"options", "userstats", &this->UserStats, DT_CHARPTR, NoValidation},
{"options", "customversion", &this->CustomVersion, DT_CHARPTR, NoValidation},
{"options", "hidesplits", &this->HideSplits, DT_BOOLEAN, NoValidation},
{"options", "hidebans", &this->HideBans, DT_BOOLEAN, NoValidation},
{"options", "tempdir", &this->TempDir, DT_CHARPTR, ValidateTempDir},
{"options", "nouserdns", &this->NoUserDns, DT_BOOLEAN, NoValidation},
{"options", "syntaxhints", &this->SyntaxHints, DT_BOOLEAN, NoValidation},
+ {"options", "cyclehosts", &this->CycleHosts, DT_BOOLEAN, NoValidation},
{"pid", "file", &this->PID, DT_CHARPTR, NoValidation},
{NULL}
};
if (this->LoadConf(newconfig, CONFIG_FILE, errstr))
{
/* If we succeeded, set the ircd config to the new one */
- this->config_data = newconfig;
-
-/* int c = 1;
- std::string last;
-
- for(ConfigDataHash::const_iterator i = this->config_data.begin(); i != this->config_data.end(); i++)
- {
- c = (i->first != last) ? 1 : c+1;
- last = i->first;
-
- std::cout << "[" << i->first << " " << c << "/" << this->config_data.count(i->first) << "]" << std::endl;
-
- for(KeyValList::const_iterator j = i->second.begin(); j != i->second.end(); j++)
- std::cout << "\t" << j->first << " = " << j->second << std::endl;
-
- std::cout << "[/" << i->first << " " << c << "/" << this->config_data.count(i->first) << "]" << std::endl;
- }
- */ }
+ this->config_data = newconfig;
+ }
else
{
- log(DEFAULT, "There were errors in your configuration:\n%s", errstr.str().c_str());
+ ServerInstance->Log(DEFAULT, "There were errors in your configuration:\n%s", errstr.str().c_str());
if (bail)
{
- /* Unneeded because of the log() aboive? */
+ /* Unneeded because of the ServerInstance->Log() aboive? */
printf("There were errors in your configuration:\n%s",errstr.str().c_str());
- Exit(0);
+ InspIRCd::Exit(ERROR);
}
else
{
// write once here, to try it out and make sure its ok
ServerInstance->WritePID(this->PID);
- log(DEFAULT,"Done reading configuration file, InspIRCd is now starting.");
+ ServerInstance->Log(DEFAULT,"Done reading configuration file, InspIRCd is now starting.");
/* If we're rehashing, let's load any new modules, and unload old ones
*/
if (!bail)
{
- ServerInstance->stats->BoundPortCount = BindPorts(false);
+ int found_ports;
+ ServerInstance->stats->BoundPortCount = ServerInstance->BindPorts(false, found_ports);
if (!removed_modules.empty())
for (std::vector<std::string>::iterator removing = removed_modules.begin(); removing != removed_modules.end(); removing++)
}
}
- log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules.",(unsigned long)rem,(unsigned long)removed_modules.size(),(unsigned long)add,(unsigned long)added_modules.size());
+ ServerInstance->Log(DEFAULT,"Successfully unloaded %lu of %lu modules and loaded %lu of %lu modules.",(unsigned long)rem,(unsigned long)removed_modules.size(),(unsigned long)add,(unsigned long)added_modules.size());
}
}
if ((ch == '\\') && (in_quote) && (in_tag))
{
line += ch;
- log(DEBUG,"Escape sequence in config line.");
+ ServerInstance->Log(DEBUG,"Escape sequence in config line.");
char real_character;
if (conf.get(real_character))
{
- log(DEBUG,"Escaping %c", real_character);
+ ServerInstance->Log(DEBUG,"Escaping %c", real_character);
+ if (real_character == 'n')
+ real_character = '\n';
line += real_character;
continue;
}
if ((*c == '\\') && (in_quote))
{
c++;
- current_value += *c;
+ if (*c == 'n')
+ current_value += '\n';
+ else
+ current_value += *c;
continue;
}
if (*c == '"')
}
else if(pos == 0)
{
- log(DEBUG, "No <%s> tags in config file.", tag.c_str());
+ ServerInstance->Log(DEBUG, "No <%s> tags in config file.", tag.c_str());
}
else
{
- log(DEBUG, "ConfValue got an out-of-range index %d, there are only %d occurences of %s", pos, target.count(tag), tag.c_str());
+ ServerInstance->Log(DEBUG, "ConfValue got an out-of-range index %d, there are only %d occurences of %s", pos, target.count(tag), tag.c_str());
}
return false;
}
else if(pos == 0)
{
- log(DEBUG, "No <%s> tags in config file.", tag.c_str());
+ ServerInstance->Log(DEBUG, "No <%s> tags in config file.", tag.c_str());
}
else
{
- log(DEBUG, "ConfVarEnum got an out-of-range index %d, there are only %d occurences of %s", pos, target.count(tag), tag.c_str());
+ ServerInstance->Log(DEBUG, "ConfVarEnum got an out-of-range index %d, there are only %d occurences of %s", pos, target.count(tag), tag.c_str());
}
return 0;
char linebuf[MAXBUF];
F.clear();
- file = fopen(fname,"r");
+
+ if (*fname != '/')
+ {
+ std::string::size_type pos;
+ std::string confpath = CONFIG_FILE;
+ if((pos = confpath.find("/inspircd.conf")) != std::string::npos)
+ {
+ /* Leaves us with just the path */
+ std::string newfile = confpath.substr(0, pos) + std::string("/") + fname;
+ file = fopen(newfile.c_str(), "r");
+
+ }
+ }
+ else
+ file = fopen(fname, "r");
if (file)
{
while (!feof(file))
{
- fgets(linebuf,sizeof(linebuf),file);
- linebuf[strlen(linebuf)-1]='\0';
-
- if (!*linebuf)
- {
- strcpy(linebuf," ");
- }
+ fgets(linebuf, sizeof(linebuf), file);
+ linebuf[strlen(linebuf)-1] = 0;
if (!feof(file))
{
- F.push_back(linebuf);
+ F.push_back(*linebuf ? linebuf : " ");
}
}
return otherdir;
}
+InspIRCd* ServerConfig::GetInstance()
+{
+ return ServerInstance;
+}
projects / user / henk / code / inspircd.git / blobdiff