Add <connect:maxchans> as per feature bug #338 - combined with the last feature,...

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 05027652590a27b6d7d152ed0eb50cd040fb7550..b3258eb2ee1702d1532a1b53f56583a26301a2d3 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -404,16 +404,41 @@ bool DoConnect(ServerConfig* conf, const char* tag, char** entries, ValueList &v
        int recvq = values[8].GetInteger();
        int localmax = values[9].GetInteger();
        int globalmax = values[10].GetInteger();
+       int port = values[11].GetInteger();
+       const char* name = values[12].GetString();
+       const char* parent = values[13].GetString();
+       int maxchans = values[14].GetInteger();
 
-       if (*allow)
+       if (*parent)
        {
-               ConnectClass c(timeout, flood, allow, pingfreq, password, threshold, sendq, recvq, localmax, globalmax);
-               conf->Classes.push_back(c);
+               /* 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)
+               {
+                       if (item->GetName() == name)
+                       {
+                               ConnectClass c(name, *item);
+                               c.Update(timeout, flood, std::string(*allow ? allow : deny), pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans, port);
+                               conf->Classes.push_back(c);
+                       }
+               }
+               throw CoreException("Class name '" + std::string(name) + "' is configured to inherit from class '" + std::string(name) + "' which cannot be found.");
        }
        else
        {
-               ConnectClass c(deny);
-               conf->Classes.push_back(c);
+               if (*allow)
+               {
+                       ConnectClass c(name, timeout, flood, allow, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans);
+                       c.SetPort(port);
+                       conf->Classes.push_back(c);
+               }
+               else
+               {
+                       ConnectClass c(name, deny);
+                       c.SetPort(port);
+                       conf->Classes.push_back(c);
+               }
        }
 
        return true;
@@ -647,12 +672,15 @@ void ServerConfig::Read(bool bail, userrec* user)
                {"connect",
                                {"allow",       "deny",         "password",     "timeout",      "pingfreq",     "flood",
                                "threshold",    "sendq",        "recvq",        "localmax",     "globalmax",    "port",
+                               "name",         "parent",       "maxchans",
                                NULL},
                                {"",            "",             "",             "",             "120",          "",
                                 "",            "",             "",             "3",            "3",            "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_INTEGER,    DT_INTEGER,     DT_INTEGER,     DT_INTEGER,     DT_INTEGER,     DT_INTEGER,
+                                DT_CHARPTR,    DT_CHARPTR,     DT_INTEGER},
                                InitConnect, DoConnect, DoneConnect},
 
                {"uline",
@@ -968,7 +996,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
        include_stack.push_back(filename);
 
        /* Start reading characters... */
-       while(conf.get(ch))
+       while (conf.get(ch))
        {
 
                /*
@@ -994,10 +1022,10 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                 * no '>' then die with an error.
                 */
 
-               if((ch == '#') && !in_quote)
+               if ((ch == '#') && !in_quote)
                        in_comment = true;
 
-               switch(ch)
+               switch (ch)
                {
                        case '\n':
                                if (in_quote)
@@ -1044,11 +1072,11 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                if (ch != '\r')
                        line += ch;
 
-               if(ch == '<')
+               if (ch == '<')
                {
-                       if(in_tag)
+                       if (in_tag)
                        {
-                               if(!in_quote)
+                               if (!in_quote)
                                {
                                        errorstream << "Got another opening < when the first one wasn't closed: " << filename << ":" << linenumber << std::endl;
                                        return false;
@@ -1056,7 +1084,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                        }
                        else
                        {
-                               if(in_quote)
+                               if (in_quote)
                                {
                                        errorstream << "We're in a quote but outside a tag, interesting. " << filename << ":" << linenumber << std::endl;
                                        return false;
@@ -1068,11 +1096,11 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                                }
                        }
                }
-               else if(ch == '"')
+               else if (ch == '"')
                {
-                       if(in_tag)
+                       if (in_tag)
                        {
-                               if(in_quote)
+                               if (in_quote)
                                {
                                        // errorstream << "Closing quote in config tag on line " << linenumber << std::endl;
                                        in_quote = false;
@@ -1085,7 +1113,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                        }
                        else
                        {
-                               if(in_quote)
+                               if (in_quote)
                                {
                                        errorstream << "Found a (closing) \" outside a tag: " << filename << ":" << linenumber << std::endl;
                                }
@@ -1095,11 +1123,11 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                                }
                        }
                }
-               else if(ch == '>')
+               else if (ch == '>')
                {
-                       if(!in_quote)
+                       if (!in_quote)
                        {
-                               if(in_tag)
+                               if (in_tag)
                                {
                                        // errorstream << "Closing config tag on line " << linenumber << std::endl;
                                        in_tag = false;
@@ -1109,7 +1137,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                                         * LoadConf() and load the included config into the same ConfigDataHash
                                         */
 
-                                       if(!this->ParseLine(target, line, linenumber, errorstream))
+                                       if (!this->ParseLine(target, line, linenumber, errorstream))
                                                return false;
 
                                        line.clear();
@@ -1123,6 +1151,13 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
                }
        }
 
+       /* Fix for bug #392 - if we reach the end of a file and we are still in a quote or comment, most likely the user fucked up */
+       if (in_comment || in_quote)
+       {
+               errorstream << "Reached end of file whilst still inside a quoted section or tag. This is most likely an error or there \
+                       is a newline missing from the end of the file: " << filename << ":" << linenumber << std::endl;
+       }
+
        return true;
 }
 
@@ -1131,7 +1166,7 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const std::string &filename,
        return this->LoadConf(target, filename.c_str(), errorstream);
 }
 
-bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long linenumber, std::ostringstream &errorstream)
+bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long &linenumber, std::ostringstream &errorstream)
 {
        std::string tagname;
        std::string current_key;
@@ -1143,17 +1178,15 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin
 
        got_name = got_key = in_quote = false;
 
-       //std::cout << "ParseLine(data, '" << line << "', " << linenumber << ", stream)" << std::endl;
-
        for(std::string::iterator c = line.begin(); c != line.end(); c++)
        {
-               if(!got_name)
+               if (!got_name)
                {
                        /* We don't know the tag name yet. */
 
-                       if(*c != ' ')
+                       if (*c != ' ')
                        {
-                               if(*c != '<')
+                               if (*c != '<')
                                {
                                        tagname += *c;
                                }
@@ -1206,6 +1239,7 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin
                                {
                                        /* Got a 'real' \n, treat it as part of the value */
                                        current_value += '\n';
+                                       linenumber++;
                                        continue;
                                }
                                else if ((*c == '\r') && (in_quote))
@@ -1229,9 +1263,9 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin
                                                in_quote = false;
                                                got_key = false;
 
-                                               if((tagname == "include") && (current_key == "file"))
+                                               if ((tagname == "include") && (current_key == "file"))
                                                {
-                                                       if(!this->DoInclude(target, current_value, errorstream))
+                                                       if (!this->DoInclude(target, current_value, errorstream))
                                                                return false;
                                                }
 
@@ -1241,7 +1275,7 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin
                                }
                                else
                                {
-                                       if(in_quote)
+                                       if (in_quote)
                                        {
                                                current_value += *c;
                                        }