Add PackageInfo directives for Debian.

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index 005730dca12987a6f1a4890c231b03d68df5c0ea..2a50a22b394a2aa96831b75a82650425565b2ded 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -62,17 +62,9 @@ ServerConfig::ServerConfig()
        : EmptyTag(CreateEmptyTag())
        , Limits(EmptyTag)
        , Paths(EmptyTag)
+       , RawLog(false)
        , NoSnoticeStack(false)
 {
-       RawLog = HideBans = HideSplits = false;
-       WildcardIPv6 = true;
-       MaxTargets = 20;
-       NetBufferSize = 10240;
-       MaxConn = SOMAXCONN;
-       MaxChans = 20;
-       OperMaxChans = 30;
-       c_ipv4_range = 32;
-       c_ipv6_range = 128;
 }
 
 ServerConfig::~ServerConfig()
@@ -100,22 +92,27 @@ static void ValidHost(const std::string& p, const std::string& msg)
                throw CoreException("The value of "+msg+" is not a valid hostname");
 }
 
-bool ServerConfig::ApplyDisabledCommands(const std::string& data)
+bool ServerConfig::ApplyDisabledCommands()
 {
-       std::stringstream dcmds(data);
-       std::string thiscmd;
-
-       /* Enable everything first */
+       // Enable everything first.
        const CommandParser::CommandMap& commands = ServerInstance->Parser.GetCommands();
        for (CommandParser::CommandMap::const_iterator x = commands.begin(); x != commands.end(); ++x)
                x->second->Disable(false);
 
-       /* Now disable all the ones which the user wants disabled */
-       while (dcmds >> thiscmd)
+       // Now disable the commands specified in the config.
+       std::string command;
+       irc::spacesepstream commandlist(ConfValue("disabled")->getString("commands"));
+       while (commandlist.GetToken(command))
        {
-               Command* handler = ServerInstance->Parser.GetHandler(thiscmd);
-               if (handler)
-                       handler->Disable(true);
+               Command* handler = ServerInstance->Parser.GetHandler(command);
+               if (!handler)
+               {
+                       ServerInstance->Logs->Log("CONFIG", LOG_DEBUG, "Unable to disable the %s command as it does not exist!", command.c_str());
+                       continue;
+               }
+
+               ServerInstance->Logs->Log("CONFIG", LOG_DEBUG, "The %s command has been disabled", command.c_str());
+               handler->Disable(true);
        }
        return true;
 }
@@ -161,9 +158,8 @@ void ServerConfig::CrossCheckOperClassType()
                if (OperTypes.find(name) != OperTypes.end())
                        throw CoreException("Duplicate type block with name " + name + " at " + tag->getTagLocation());
 
-               OperInfo* ifo = new OperInfo;
+               OperInfo* ifo = new OperInfo(name);
                OperTypes[name] = ifo;
-               ifo->name = name;
                ifo->type_block = tag;
 
                std::string classname;
@@ -193,8 +189,7 @@ void ServerConfig::CrossCheckOperClassType()
                if (oper_blocks.find(name) != oper_blocks.end())
                        throw CoreException("Duplicate oper block with name " + name + " at " + tag->getTagLocation());
 
-               OperInfo* ifo = new OperInfo;
-               ifo->name = type;
+               OperInfo* ifo = new OperInfo(type);
                ifo->oper_block = tag;
                ifo->type_block = tblk->second->type_block;
                ifo->class_blocks.assign(tblk->second->class_blocks.begin(), tblk->second->class_blocks.end());
@@ -431,7 +426,6 @@ void ServerConfig::Fill()
        ServerDesc = server->getString("description", "Configure Me");
        Network = server->getString("network", "Network");
        NetBufferSize = ConfValue("performance")->getInt("netbuffersize", 10240, 1024, 65534);
-       DisabledCommands = ConfValue("disabled")->getString("commands", "");
        DisabledDontExist = ConfValue("disabled")->getBool("fakenonexistant");
        UserStats = security->getString("userstats");
        CustomVersion = security->getString("customversion");
@@ -483,23 +477,23 @@ void ServerConfig::Fill()
        ReadXLine(this, "badhost", "host", ServerInstance->XLines->GetFactory("K"));
        ReadXLine(this, "exception", "host", ServerInstance->XLines->GetFactory("E"));
 
-       memset(DisabledUModes, 0, sizeof(DisabledUModes));
+       DisabledUModes.reset();
        std::string modes = ConfValue("disabled")->getString("usermodes");
        for (std::string::const_iterator p = modes.begin(); p != modes.end(); ++p)
        {
                // Complain when the character is not a valid mode character.
                if (!ModeParser::IsModeChar(*p))
                        throw CoreException("Invalid usermode " + std::string(1, *p) + " was found.");
-               DisabledUModes[*p - 'A'] = 1;
+               DisabledUModes.set(*p - 'A');
        }
 
-       memset(DisabledCModes, 0, sizeof(DisabledCModes));
+       DisabledCModes.reset();
        modes = ConfValue("disabled")->getString("chanmodes");
        for (std::string::const_iterator p = modes.begin(); p != modes.end(); ++p)
        {
                if (!ModeParser::IsModeChar(*p))
                        throw CoreException("Invalid chanmode " + std::string(1, *p) + " was found.");
-               DisabledCModes[*p - 'A'] = 1;
+               DisabledCModes.set(*p - 'A');
        }
 
        std::string v = security->getString("announceinvites");
@@ -548,6 +542,7 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
                /*
                 * These values can only be set on boot. Keep their old values. Do it before we send messages so we actually have a servername.
                 */
+               this->CaseMapping = old->CaseMapping;
                this->ServerName = old->ServerName;
                this->sid = old->sid;
                this->cmdline = old->cmdline;
@@ -729,6 +724,10 @@ void ServerConfig::ApplyModules(User* user)
 
        for (std::vector<std::string>::iterator adding = added_modules.begin(); adding != added_modules.end(); adding++)
        {
+               // Skip modules which are already loaded.
+               if (ServerInstance->Modules->Find(*adding))
+                       continue;
+
                if (ServerInstance->Modules->Load(*adding))
                {
                        ServerInstance->SNO->WriteGlobalSno('a', "*** REHASH LOADED MODULE: %s",adding->c_str());
@@ -815,7 +814,7 @@ void ConfigReaderThread::Finish()
                ServerInstance->XLines->ApplyLines();
                ChanModeReference ban(NULL, "ban");
                static_cast<ListModeBase*>(*ban)->DoRehash();
-               Config->ApplyDisabledCommands(Config->DisabledCommands);
+               Config->ApplyDisabledCommands();
                User* user = ServerInstance->FindNick(TheUserUID);
 
                ConfigStatus status(user);