Use XLineFactory in ADDLINE, so that it can deal with anything the rest of the ircd...

[user/henk/code/inspircd.git] / src / configreader.cpp

diff --git a/src/configreader.cpp b/src/configreader.cpp
index b026f5a9f82024b9e6f516f127400d8dde8b30c6..8311ad58eb3f0ba15ddb8b1ae0af9ef976c548d6 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -31,6 +31,7 @@ std::vector<std::string> old_module_names, new_module_names, added_modules, remo
 
 /* Needs forward declaration */
 bool ValidateDnsServer(ServerConfig* conf, const char* tag, const char* value, ValueItem &data);
+bool DoneELine(ServerConfig* conf, const char* tag);
 
 ServerConfig::ServerConfig(InspIRCd* Instance) : ServerInstance(Instance)
 {
@@ -181,6 +182,11 @@ 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*, const char*, ValueItem &data)
 {
        if ((data.GetInteger() < 0) || (data.GetInteger() > 31))
@@ -492,17 +498,21 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*)
                /* 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)
                {
                        ConnectClass* c = *item;
+                       conf->GetInstance()->Log(DEBUG,"Class: %s", c->GetName().c_str());
                        if (c->GetName() == parent)
                        {
-                               ConnectClass* c = new ConnectClass(name, c);
-                               c->Update(timeout, flood, *allow ? allow : deny, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans, port, limit);
-                               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
        {
@@ -789,19 +799,19 @@ void ServerConfig::Read(bool bail, User* user)
                                {"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},
@@ -1387,15 +1397,10 @@ bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, st
        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)
                {
@@ -1404,7 +1409,7 @@ bool ServerConfig::DoInclude(ConfigDataHash &target, const std::string &file, st
                }
                else
                {
-                       errorstream << "Couldn't get config path from: " << confpath << std::endl;
+                       errorstream << "Couldn't get config path from: " << ServerInstance->ConfigFileName << std::endl;
                        return false;
                }
        }
@@ -1908,3 +1913,77 @@ 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, NULL))
+               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, NULL))
+               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, NULL))
+               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, NULL))
+               delete el;
+       return true;
+}
+
+// this should probably be moved to configreader, but atm it relies on CheckELines above.
+bool DoneELine(ServerConfig* conf, const char* tag)
+{
+       for (std::vector<User*>::const_iterator u2 = conf->GetInstance()->local_users.begin(); u2 != conf->GetInstance()->local_users.end(); u2++)
+       {
+               User* u = (User*)(*u2);
+               u->exempt = false;
+       }
+
+       conf->GetInstance()->XLines->CheckELines(conf->GetInstance()->XLines->lookup_lines['E']);
+       return true;
+}
+