Purge the deprecated hash_map from existance.

[user/henk/code/inspircd.git] / src / modules / m_spanningtree / utils.cpp

diff --git a/src/modules/m_spanningtree/utils.cpp b/src/modules/m_spanningtree/utils.cpp
index 11fdeb6cc62e8be612cf3cab78fdd547036d09ec..cc1c400db9059c739804bfa23f51fd9f6994588d 100644 (file)
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -130,12 +130,6 @@ TreeServer* SpanningTreeUtilities::FindServerID(const std::string &id)
                return NULL;
 }
 
-/* A convenient wrapper that returns true if a server exists */
-bool SpanningTreeUtilities::IsServer(const std::string &ServerName)
-{
-       return (FindServer(ServerName) != NULL);
-}
-
 SpanningTreeUtilities::SpanningTreeUtilities(ModuleSpanningTree* C) : Creator(C)
 {
        ServerInstance->Logs->Log("m_spanningtree",DEBUG,"***** Using SID for hash: %s *****", ServerInstance->Config->GetSID().c_str());
@@ -208,23 +202,6 @@ void SpanningTreeUtilities::GetListOfServersForChannel(Channel* c, TreeServerLis
        return;
 }
 
-bool SpanningTreeUtilities::DoOneToAllButSenderRaw(const std::string &data, const std::string &omit, const std::string &prefix, const irc::string &command, const parameterlist &params)
-{
-       TreeServer* omitroute = this->BestRouteTo(omit);
-       unsigned int items =this->TreeRoot->ChildCount();
-       for (unsigned int x = 0; x < items; x++)
-       {
-               TreeServer* Route = this->TreeRoot->GetChild(x);
-               if ((Route) && (Route->GetSocket()) && (Route->GetName() != omit) && (omitroute != Route))
-               {
-                       TreeSocket* Sock = Route->GetSocket();
-                       if (Sock)
-                               Sock->WriteLine(data);
-               }
-       }
-       return true;
-}
-
 bool SpanningTreeUtilities::DoOneToAllButSender(const std::string &prefix, const std::string &command, const parameterlist &params, std::string omit)
 {
        TreeServer* omitroute = this->BestRouteTo(omit);
@@ -337,7 +314,7 @@ void SpanningTreeUtilities::RefreshIPCache()
                {
                        try
                        {
-                               bool cached;
+                               bool cached = false;
                                SecurityIPResolver* sr = new SecurityIPResolver(Creator, this, L->IPAddr, L, cached, DNS_QUERY_AAAA);
                                ServerInstance->AddResolver(sr, cached);
                        }
@@ -350,16 +327,16 @@ void SpanningTreeUtilities::RefreshIPCache()
 
 void SpanningTreeUtilities::ReadConfiguration()
 {
-       ConfigReader Conf;
-
-       FlatLinks = Conf.ReadFlag("security","flatlinks",0);
-       HideULines = Conf.ReadFlag("security","hideulines",0);
-       AnnounceTSChange = Conf.ReadFlag("options","announcets",0);
-       AllowOptCommon = Conf.ReadFlag("options", "allowmismatch", 0);
-       ChallengeResponse = !Conf.ReadFlag("security", "disablehmac", 0);
-       quiet_bursts = Conf.ReadFlag("performance", "quietbursts", 0);
-       PingWarnTime = Conf.ReadInteger("options", "pingwarning", 0, true);
-       PingFreq = Conf.ReadInteger("options", "serverpingfreq", 0, true);
+       ConfigTag* security = ServerInstance->Config->ConfValue("security");
+       ConfigTag* options = ServerInstance->Config->ConfValue("options");
+       FlatLinks = security->getBool("flatlinks");
+       HideULines = security->getBool("hideulines");
+       AnnounceTSChange = options->getBool("announcets");
+       AllowOptCommon = options->getBool("allowmismatch");
+       ChallengeResponse = !security->getBool("disablehmac");
+       quiet_bursts = ServerInstance->Config->ConfValue("performance")->getBool("quietbursts");
+       PingWarnTime = options->getInt("pingwarning");
+       PingFreq = options->getInt("serverpingfreq");
 
        if (PingFreq == 0)
                PingFreq = 60;