Stupid linebreak.

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 7f211084cfb60170070bce93deec6d05fa98dcba..b4f28d04e219f79f967bdbb401724b30e5b217f4 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -23,6 +23,7 @@
 /* $CopyInstall: conf/modules.conf.example $(CONPATH) */
 /* $CopyInstall: conf/opers.conf.example $(CONPATH) */
 /* $CopyInstall: conf/links.conf.example $(CONPATH) */
+/* $CopyInstall: .gdbargs $(BASE) */
 
 #include "inspircd.h"
 #include <fstream>
@@ -499,18 +500,16 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*)
        const char* password = values[2].GetString();
        int timeout = values[3].GetInteger();
        int pingfreq = values[4].GetInteger();
-       int flood = values[5].GetInteger();
-       int threshold = values[6].GetInteger();
-       int sendq = values[7].GetInteger();
-       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();
-       unsigned long limit = values[15].GetInteger();
-       const char* hashtype = values[16].GetString();
+       int sendq = values[5].GetInteger();
+       int recvq = values[6].GetInteger();
+       int localmax = values[7].GetInteger();
+       int globalmax = values[8].GetInteger();
+       int port = values[9].GetInteger();
+       const char* name = values[10].GetString();
+       const char* parent = values[11].GetString();
+       int maxchans = values[12].GetInteger();
+       unsigned long limit = values[13].GetInteger();
+       const char* hashtype = values[14].GetString();
 
        conf->GetInstance()->Logs->Log("CONFIG",DEFAULT,"Adding a connect class!");
 
@@ -529,7 +528,7 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*)
                        if (cc->GetName() == parent)
                        {
                                cc = new ConnectClass(name, cc);
-                               cc->Update(timeout, flood, *allow ? allow : deny, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans, port, limit);
+                               cc->Update(timeout, *allow ? allow : deny, pingfreq, password, sendq, recvq, localmax, globalmax, maxchans, port, limit);
                                conf->Classes.push_back(cc);
                                break;
                        }
@@ -546,11 +545,11 @@ bool DoConnect(ServerConfig* conf, const char*, char**, ValueList &values, int*)
                        {
                                if ((*item)->GetHost() == allow && !(*item)->GetDisabled())
                                {
-                                       (*item)->Update(timeout, flood, allow, pingfreq, password, threshold, sendq, recvq, localmax, globalmax, maxchans, port, limit);
+                                       (*item)->Update(timeout, allow, pingfreq, password, sendq, recvq, localmax, globalmax, maxchans, port, limit);
                                        return true;
                                }
                        }
-                       cc = new ConnectClass(name, timeout, flood, allow, pingfreq, password, hashtype, threshold, sendq, recvq, localmax, globalmax, maxchans);
+                       cc = new ConnectClass(name, timeout, allow, pingfreq, password, hashtype, sendq, recvq, localmax, globalmax, maxchans);
                        cc->limit = limit;
                        cc->SetPort(port);
                        conf->Classes.push_back(cc);
@@ -856,18 +855,16 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
        MultiConfig MultiValues[] = {
 
                {"connect",
-                               {"allow",       "deny",         "password",     "timeout",      "pingfreq",     "flood",
-                               "threshold",    "sendq",        "recvq",        "localmax",     "globalmax",    "port",
+                               {"allow",       "deny",         "password",     "timeout",      "pingfreq",
+                               "sendq",        "recvq",        "localmax",     "globalmax",    "port",
                                "name",         "parent",       "maxchans",     "limit",        "hash",
                                NULL},
-                               {"",            "",             "",             "",             "120",          "",
-                                "",            "",             "",             "3",            "3",            "0",
-                                "",            "",             "0",        "0",        "",
+                               {"",            "",                             "",                     "",                     "120",
+                                "",            "",                             "3",            "3",            "0",
+                                "",            "",                             "0",        "0",                "",
                                 NULL},
-                               {DT_IPADDRESS|DT_ALLOW_WILD,
-                                               DT_IPADDRESS|DT_ALLOW_WILD,
-                                                               DT_CHARPTR,     DT_INTEGER,     DT_INTEGER,     DT_INTEGER,
-                               DT_INTEGER,     DT_INTEGER,     DT_INTEGER,     DT_INTEGER,     DT_INTEGER,     DT_INTEGER,
+                               {DT_IPADDRESS|DT_ALLOW_WILD, DT_IPADDRESS|DT_ALLOW_WILD, DT_CHARPTR,    DT_INTEGER,     DT_INTEGER,
+                               DT_INTEGER,     DT_INTEGER,     DT_INTEGER,     DT_INTEGER,     DT_INTEGER,
                                DT_NOSPACES,    DT_NOSPACES,    DT_INTEGER,     DT_INTEGER,     DT_CHARPTR},
                                InitConnect, DoConnect, DoneConnect},
 
@@ -1227,12 +1224,6 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
        // write once here, to try it out and make sure its ok
        ServerInstance->WritePID(this->PID);
 
-       /* Switch over logfiles */
-       ServerInstance->Logs->CloseLogs();
-       ServerInstance->Logs->OpenFileLogs();
-
-       ServerInstance->Logs->Log("CONFIG", DEFAULT, "Done reading configuration file.");
-
        /* If we're rehashing, let's load any new modules, and unload old ones
         */
        if (!bail)
@@ -1323,24 +1314,11 @@ void ServerConfig::Read(bool bail, const std::string &useruid)
                                }
                        }
                }
-
-               ServerInstance->Logs->Log("CONFIG", 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->Threads->Unlock();
 
        }
 
-       if (bail)
-       {
-               /** Note: This is safe, the method checks for user == NULL */
-               ServerInstance->Threads->Lock();
-               User* user = NULL;
-               if (!useruid.empty())
-                       user = ServerInstance->FindNick(useruid);
-               ServerInstance->Parser->SetupCommandTable(user);
-               ServerInstance->Threads->Unlock();
-       }
-       else
+       if (!bail)
        {
                if (!useruid.empty())
                {