* ---------------------------------------------------
*/
+/* $Core: libIRCDconfigreader */
+/* $CopyInstall: conf/inspircd.quotes.example $(CONPATH) */
+/* $CopyInstall: conf/inspircd.rules.example $(CONPATH) */
+/* $CopyInstall: conf/inspircd.motd.example $(CONPATH) */
+/* $CopyInstall: conf/inspircd.helpop-full.example $(CONPATH) */
+/* $CopyInstall: conf/inspircd.helpop.example $(CONPATH) */
+/* $CopyInstall: conf/inspircd.censor.example $(CONPATH) */
+/* $CopyInstall: conf/inspircd.filter.example $(CONPATH) */
+/* $CopyInstall: docs/inspircd.conf.example $(CONPATH) */
+
#include "inspircd.h"
#include <fstream>
#include "xline.h"
user->WriteServ("005 %s %s", user->nick, line->c_str());
}
-bool ServerConfig::CheckOnce(char* tag, bool bail, User* user)
+bool ServerConfig::CheckOnce(char* tag)
{
int count = ConfValueEnum(this->config_data, tag);
return true;
}
-bool NoValidation(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+bool NoValidation(ServerConfig*, const char*, const char*, ValueItem&)
+{
+ return true;
+}
+
+bool DoneConfItem(ServerConfig* conf, const char* tag)
{
return true;
}
-bool ValidateMaxTargets(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+bool ValidateMaxTargets(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
if ((data.GetInteger() < 0) || (data.GetInteger() > 31))
{
return true;
}
-bool ValidateSoftLimit(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+bool ValidateSoftLimit(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
if ((data.GetInteger() < 1) || (data.GetInteger() > MAXCLIENTS))
{
return true;
}
-bool ValidateMaxConn(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+bool ValidateMaxConn(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
if (data.GetInteger() > SOMAXCONN)
conf->GetInstance()->Log(DEFAULT,"WARNING: <options:somaxconn> value may be higher than the system-defined SOMAXCONN value!");
return true;
}
-bool ValidateDnsServer(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+bool ValidateDnsServer(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
if (!*(data.GetString()))
{
return true;
}
-bool ValidateServerName(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+bool ValidateServerName(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
/* If we already have a servername, and they changed it, we should throw an exception. */
if ((strcasecmp(conf->ServerName, data.GetString())) && (*conf->ServerName))
{
throw CoreException("Configuration error: You cannot change your servername at runtime! Please restart your server for this change to be applied.");
- /* XXX: We don't actually reach this return of course... */
+ /* We don't actually reach this return of course... */
return false;
}
if (!strchr(data.GetString(),'.'))
return true;
}
-bool ValidateNetBufferSize(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+bool ValidateNetBufferSize(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
if ((!data.GetInteger()) || (data.GetInteger() > 65535) || (data.GetInteger() < 1024))
{
return true;
}
-bool ValidateMaxWho(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+bool ValidateMaxWho(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
if ((data.GetInteger() > 65535) || (data.GetInteger() < 1))
{
return true;
}
-bool ValidateLogLevel(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+bool ValidateLogLevel(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
std::string dbg = data.GetString();
conf->LogLevel = DEFAULT;
return true;
}
-bool ValidateMotd(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+bool ValidateMotd(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
conf->ReadFile(conf->MOTD, data.GetString());
return true;
}
-bool ValidateNotEmpty(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+bool ValidateNotEmpty(ServerConfig*, const char* tag, const char*, ValueItem &data)
{
if (!*data.GetString())
throw CoreException(std::string("The value for ")+tag+" cannot be empty!");
return true;
}
-bool ValidateRules(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+bool ValidateRules(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
conf->ReadFile(conf->RULES, data.GetString());
return true;
}
-bool ValidateModeLists(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+bool ValidateModeLists(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
memset(conf->HideModeLists, 0, 256);
for (const unsigned char* x = (const unsigned char*)data.GetString(); *x; ++x)
return true;
}
-bool ValidateExemptChanOps(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+bool ValidateExemptChanOps(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
memset(conf->ExemptChanOps, 0, 256);
for (const unsigned char* x = (const unsigned char*)data.GetString(); *x; ++x)
return true;
}
-bool ValidateInvite(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+bool ValidateInvite(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
std::string v = data.GetString();
return true;
}
-bool ValidateSID(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+bool ValidateSID(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
int sid = data.GetInteger();
if ((sid > 999) || (sid < 0))
return true;
}
-bool ValidateWhoWas(ServerConfig* conf, const char* tag, const char* value, ValueItem &data)
+bool ValidateWhoWas(ServerConfig* conf, const char*, const char*, ValueItem &data)
{
conf->WhoWasMaxKeep = conf->GetInstance()->Duration(data.GetString());
/* Callback called before processing the first <connect> tag
*/
-bool InitConnect(ServerConfig* conf, const char* tag)
+bool InitConnect(ServerConfig* conf, const char*)
{
conf->GetInstance()->Log(DEFAULT,"Reading connect classes...");
- conf->Classes.clear();
+
+ for (ClassVector::iterator i = conf->Classes.begin(); i != conf->Classes.end(); i++)
+ {
+ ConnectClass *c = *i;
+
+ conf->GetInstance()->Log(DEBUG, "Address of class is %p", c);
+ }
+
+ for (ClassVector::iterator i = conf->Classes.begin(); i != conf->Classes.end(); i++)
+ {
+ ConnectClass *c = *i;
+
+ /* only delete a class with refcount 0 */
+ if (c->RefCount == 0)
+ {
+ conf->GetInstance()->Log(DEFAULT, "Removing connect class, refcount is 0!");
+ conf->Classes.erase(i);
+ i = conf->Classes.begin(); // start over so we don't trample on a bad iterator
+ }
+
+ /* also mark all existing classes disabled, if they still exist in the conf, they will be reenabled. */
+ c->SetDisabled(true);
+ }
+
return true;
}
/* Callback called to process a single <connect> tag
*/
-bool DoConnect(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
+bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*)
{
ConnectClass c;
const char* allow = values[0].GetString(); /* Yeah, there are a lot of values. Live with it. */
const char* name = values[12].GetString();
const char* parent = values[13].GetString();
int maxchans = values[14].GetInteger();
+ unsigned long limit = values[15].GetInteger();
+
+ /*
+ * duplicates check: Now we don't delete all connect classes on rehash, we need to ensure we don't add dupes.
+ * easier said than done, but for now we'll just disallow anything with a duplicate host or name. -- w00t
+ */
+ for (ClassVector::iterator item = conf->Classes.begin(); item != conf->Classes.end(); ++item)
+ {
+ ConnectClass* c = *item;
+ if ((*name && (c->GetName() == name)) || (*allow && (c->GetHost() == allow)) || (*deny && (c->GetHost() == deny)))
+ {
+ /* reenable class so users can be shoved into it :P */
+ c->SetDisabled(false);
+ conf->GetInstance()->Log(DEFAULT, "Not adding class, it already exists!");
+ return true;
+ }
+ }
+
+ conf->GetInstance()->Log(DEFAULT,"Adding a connect class!");
if (*parent)
{
/* Find 'parent' and inherit a new class from it,
* then overwrite any values that are set here
*/
- for (ClassVector::iterator item = conf->Classes.begin(); item != conf->Classes.end(); ++item)
+ ClassVector::iterator item = conf->Classes.begin();
+ for (; item != conf->Classes.end(); ++item)
{
- if (item->GetName() == parent)
+ ConnectClass* c = *item;
+ conf->GetInstance()->Log(DEBUG,"Class: %s", c->GetName().c_str());
+ if (c->GetName() == parent)
{
- ConnectClass c(name, *item);
- c.Update(timeout, flood, *allow ? allow : deny, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans, port);
- conf->Classes.push_back(c);
+ ConnectClass* newclass = new ConnectClass(name, c);
+ newclass->Update(timeout, flood, *allow ? allow : deny, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans, port, limit);
+ conf->Classes.push_back(newclass);
+ break;
}
}
- throw CoreException("Class name '" + std::string(name) + "' is configured to inherit from class '" + std::string(parent) + "' which cannot be found.");
+ if (item == conf->Classes.end())
+ throw CoreException("Class name '" + std::string(name) + "' is configured to inherit from class '" + std::string(parent) + "' which cannot be found.");
}
else
{
if (*allow)
{
- ConnectClass c(name, timeout, flood, allow, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans);
- c.SetPort(port);
+ ConnectClass* c = new ConnectClass(name, timeout, flood, allow, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans);
+ c->limit = limit;
+ c->SetPort(port);
conf->Classes.push_back(c);
}
else
{
- ConnectClass c(name, deny);
- c.SetPort(port);
+ ConnectClass* c = new ConnectClass(name, deny);
+ c->SetPort(port);
conf->Classes.push_back(c);
}
}
/* Callback called when there are no more <connect> tags
*/
-bool DoneConnect(ServerConfig* conf, const char* tag)
+bool DoneConnect(ServerConfig *conf, const char*)
{
+ conf->GetInstance()->Log(DEFAULT, "Done adding connect classes!");
return true;
}
/* Callback called before processing the first <uline> tag
*/
-bool InitULine(ServerConfig* conf, const char* tag)
+bool InitULine(ServerConfig* conf, const char*)
{
conf->ulines.clear();
return true;
/* Callback called to process a single <uline> tag
*/
-bool DoULine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
+bool DoULine(ServerConfig* conf, const char*, char**, ValueList &values, int*)
{
const char* server = values[0].GetString();
const bool silent = values[1].GetBool();
/* Callback called when there are no more <uline> tags
*/
-bool DoneULine(ServerConfig* conf, const char* tag)
+bool DoneULine(ServerConfig*, const char*)
{
return true;
}
/* Callback called before processing the first <module> tag
*/
-bool InitModule(ServerConfig* conf, const char* tag)
+bool InitModule(ServerConfig* conf, const char*)
{
old_module_names.clear();
new_module_names.clear();
/* Callback called to process a single <module> tag
*/
-bool DoModule(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
+bool DoModule(ServerConfig*, const char*, char**, ValueList &values, int*)
{
const char* modname = values[0].GetString();
new_module_names.push_back(modname);
/* Callback called when there are no more <module> tags
*/
-bool DoneModule(ServerConfig* conf, const char* tag)
+bool DoneModule(ServerConfig*, const char*)
{
// now create a list of new modules that are due to be loaded
// and a seperate list of modules which are due to be unloaded
/* Callback called before processing the first <banlist> tag
*/
-bool InitMaxBans(ServerConfig* conf, const char* tag)
+bool InitMaxBans(ServerConfig* conf, const char*)
{
conf->maxbans.clear();
return true;
/* Callback called to process a single <banlist> tag
*/
-bool DoMaxBans(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
+bool DoMaxBans(ServerConfig* conf, const char*, char**, ValueList &values, int*)
{
const char* channel = values[0].GetString();
int limit = values[1].GetInteger();
/* Callback called when there are no more <banlist> tags.
*/
-bool DoneMaxBans(ServerConfig* conf, const char* tag)
+bool DoneMaxBans(ServerConfig*, const char*)
{
return true;
}
{"die", "value", "", new ValueContainerChar (this->DieValue), DT_CHARPTR, NoValidation},
{"channels", "users", "20", new ValueContainerUInt (&this->MaxChans), DT_INTEGER, NoValidation},
{"channels", "opers", "60", new ValueContainerUInt (&this->OperMaxChans), DT_INTEGER, NoValidation},
- {NULL}
+ {NULL, NULL, NULL, NULL, DT_NOTHING, NoValidation}
};
/* These tags can occur multiple times, and therefore they have special code to read them
{"connect",
{"allow", "deny", "password", "timeout", "pingfreq", "flood",
"threshold", "sendq", "recvq", "localmax", "globalmax", "port",
- "name", "parent", "maxchans",
+ "name", "parent", "maxchans", "limit",
NULL},
{"", "", "", "", "120", "",
"", "", "", "3", "3", "0",
- "", "", "0",
+ "", "", "0", "0",
NULL},
{DT_CHARPTR, DT_CHARPTR, DT_CHARPTR, DT_INTEGER, DT_INTEGER, DT_INTEGER,
DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER, DT_INTEGER,
- DT_CHARPTR, DT_CHARPTR, DT_INTEGER},
+ DT_CHARPTR, DT_CHARPTR, DT_INTEGER, DT_INTEGER},
InitConnect, DoConnect, DoneConnect},
{"uline",
{"reason", "ipmask", NULL},
{"No reason", "", NULL},
{DT_CHARPTR, DT_CHARPTR},
- InitXLine, DoZLine, DoneZLine},
+ InitXLine, DoZLine, DoneConfItem},
{"badnick",
{"reason", "nick", NULL},
{"No reason", "", NULL},
{DT_CHARPTR, DT_CHARPTR},
- InitXLine, DoQLine, DoneQLine},
+ InitXLine, DoQLine, DoneConfItem},
{"badhost",
{"reason", "host", NULL},
{"No reason", "", NULL},
{DT_CHARPTR, DT_CHARPTR},
- InitXLine, DoKLine, DoneKLine},
+ InitXLine, DoKLine, DoneConfItem},
{"exception",
{"reason", "host", NULL},
{DT_CHARPTR, DT_CHARPTR},
InitClasses, DoClass, DoneClassesAndTypes},
- {NULL}
+ {NULL,
+ {NULL},
+ {NULL},
+ {0},
+ NULL, NULL, NULL}
};
include_stack.clear();
/* Check we dont have more than one of singular tags, or any of them missing
*/
for (int Index = 0; Once[Index]; Index++)
- if (!CheckOnce(Once[Index], bail, user))
+ if (!CheckOnce(Once[Index]))
return;
/* Read the values of all the tags which occur once or not at all, and call their callbacks.
confpath = ServerInstance->ConfigFileName;
newfile = file;
- for (std::string::iterator c = newfile.begin(); c != newfile.end(); c++)
- {
- if (*c == '\\')
- {
- *c = '/';
- }
- }
+ std::replace(newfile.begin(),newfile.end(),'\\','/');
+ std::replace(confpath.begin(),confpath.end(),'\\','/');
- if (file[0] != '/')
+ if (newfile[0] != '/')
{
if((pos = confpath.rfind("/")) != std::string::npos)
{
}
else
{
- errorstream << "Couldn't get config path from: " << confpath << std::endl;
+ errorstream << "Couldn't get config path from: " << ServerInstance->ConfigFileName << std::endl;
return false;
}
}
bool ServerConfig::ConfValue(ConfigDataHash &target, const std::string &tag, const std::string &var, const std::string &default_value, int index, std::string &result, bool allow_linefeeds)
{
ConfigDataHash::size_type pos = index;
- if((pos >= 0) && (pos < target.count(tag)))
+ if (pos < target.count(tag))
{
ConfigDataHash::iterator iter = target.find(tag);
{
ConfigDataHash::size_type pos = index;
- if((pos >= 0) && (pos < target.count(tag)))
+ if (pos < target.count(tag))
{
ConfigDataHash::const_iterator iter = target.find(tag);
/*
* XXX should this be in a class? -- w00t
*/
-bool InitTypes(ServerConfig* conf, const char* tag)
+bool InitTypes(ServerConfig* conf, const char*)
{
if (conf->opertypes.size())
{
/*
* XXX should this be in a class? -- w00t
*/
-bool InitClasses(ServerConfig* conf, const char* tag)
+bool InitClasses(ServerConfig* conf, const char*)
{
if (conf->operclass.size())
{
/*
* XXX should this be in a class? -- w00t
*/
-bool DoType(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
+bool DoType(ServerConfig* conf, const char*, char**, ValueList &values, int*)
{
const char* TypeName = values[0].GetString();
const char* Classes = values[1].GetString();
/*
* XXX should this be in a class? -- w00t
*/
-bool DoClass(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
+bool DoClass(ServerConfig* conf, const char*, char**, ValueList &values, int*)
{
const char* ClassName = values[0].GetString();
const char* CommandList = values[1].GetString();
/*
* XXX should this be in a class? -- w00t
*/
-bool DoneClassesAndTypes(ServerConfig* conf, const char* tag)
+bool DoneClassesAndTypes(ServerConfig*, const char*)
+{
+ return true;
+}
+
+
+
+bool InitXLine(ServerConfig* conf, const char* tag)
+{
+ return true;
+}
+
+bool DoZLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
{
+ const char* reason = values[0].GetString();
+ const char* ipmask = values[1].GetString();
+
+ ZLine* zl = new ZLine(conf->GetInstance(), conf->GetInstance()->Time(), 0, "<Config>", reason, ipmask);
+ if (!conf->GetInstance()->XLines->AddLine(zl))
+ delete zl;
+
+ return true;
+}
+
+bool DoQLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
+{
+ const char* reason = values[0].GetString();
+ const char* nick = values[1].GetString();
+
+ QLine* ql = new QLine(conf->GetInstance(), conf->GetInstance()->Time(), 0, "<Config>", reason, nick);
+ if (!conf->GetInstance()->XLines->AddLine(ql))
+ delete ql;
+
return true;
}
+
+bool DoKLine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
+{
+ const char* reason = values[0].GetString();
+ const char* host = values[1].GetString();
+
+ XLineManager* xlm = conf->GetInstance()->XLines;
+
+ IdentHostPair ih = xlm->IdentSplit(host);
+
+ KLine* kl = new KLine(conf->GetInstance(), conf->GetInstance()->Time(), 0, "<Config>", reason, ih.first.c_str(), ih.second.c_str());
+ if (!xlm->AddLine(kl))
+ delete kl;
+ return true;
+}
+
+bool DoELine(ServerConfig* conf, const char* tag, char** entries, ValueList &values, int* types)
+{
+ const char* reason = values[0].GetString();
+ const char* host = values[1].GetString();
+
+ XLineManager* xlm = conf->GetInstance()->XLines;
+
+ IdentHostPair ih = xlm->IdentSplit(host);
+
+ ELine* el = new ELine(conf->GetInstance(), conf->GetInstance()->Time(), 0, "<Config>", reason, ih.first.c_str(), ih.second.c_str());
+ if (!xlm->AddLine(el))
+ delete el;
+ return true;
+}
+
projects / user / henk / code / inspircd.git / blobdiff