Rewrite the m_cgiirc configuration handling.

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

diff --git a/src/configreader.cpp b/src/configreader.cpp
index f29356c0cd17a1c094f156c96d8bbfbc9d23fee5..d198a1d84c83cfb78e0a4807382d1df2c23a8204 100644 (file)
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -400,6 +400,14 @@ void ServerConfig::Fill()
                sid = server->getString("id");
                if (!sid.empty() && !InspIRCd::IsSID(sid))
                        throw CoreException(sid + " is not a valid server ID. A server ID must be 3 characters long, with the first character a digit and the next two characters a digit or letter.");
+
+               CaseMapping = options->getString("casemapping", "rfc1459");
+               if (CaseMapping == "ascii")
+                       national_case_insensitive_map = ascii_case_insensitive_map;
+               else if (CaseMapping == "rfc1459")
+                       national_case_insensitive_map = rfc_case_insensitive_map;
+               else
+                       throw CoreException("<options:casemapping> must be set to 'ascii', or 'rfc1459'");
        }
        else
        {
@@ -410,6 +418,11 @@ void ServerConfig::Fill()
                std::string nsid = server->getString("id");
                if (!nsid.empty() && nsid != sid)
                        throw CoreException("You must restart to change the server id");
+
+               std::string casemapping = options->getString("casemapping");
+               if (!casemapping.empty() && casemapping != CaseMapping)
+                       throw CoreException("You must restart to change the server casemapping");
+
        }
        SoftLimit = ConfValue("performance")->getInt("softlimit", (SocketEngine::GetMaxFds() > 0 ? SocketEngine::GetMaxFds() : LONG_MAX), 10);
        CCOnConnect = ConfValue("performance")->getBool("clonesonconnect", true);
@@ -470,23 +483,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-z or A-Z
-               if ((*p < 'A') || (*p > 'z') || ((*p < 'a') && (*p > 'Z')))
+               // 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 ((*p < 'A') || (*p > 'z') || ((*p < 'a') && (*p > 'Z')))
+               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");
@@ -535,6 +548,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;
@@ -602,8 +616,7 @@ void ServerConfig::Apply(ServerConfig* old, const std::string &useruid)
                        int j = 1;
                        for (FailedPortList::iterator i = pl.begin(); i != pl.end(); i++, j++)
                        {
-                               errstr << j << ".\tAddress: " << (i->first.empty() ? "<all>" : i->first.c_str()) << "\tReason: "
-                                       << i->second << std::endl;
+                               errstr << j << ".\tAddress: " << i->first.str() << "\tReason: " << strerror(i->second) << std::endl;
                        }
                }
        }