Add LOG_ prefix to the log level enum values.

[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 75d4eaca3a7fea125317997e2ba732bcea8ac8a7..1517ac1b97735bc3c6cf0334244123fa5bd773bc 100644 (file)
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -61,7 +61,7 @@ ModResult ModuleSpanningTree::OnAcceptConnection(int newsock, ListenSocket* from
  */
 TreeServer* SpanningTreeUtilities::FindServer(const std::string &ServerName)
 {
-       if (ServerInstance->IsSID(ServerName))
+       if (InspIRCd::IsSID(ServerName))
                return this->FindServerID(ServerName);
 
        server_hash::iterator iter = serverlist.find(ServerName.c_str());
@@ -130,15 +130,9 @@ 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());
+       ServerInstance->Logs->Log("m_spanningtree",LOG_DEBUG,"***** Using SID for hash: %s *****", ServerInstance->Config->GetSID().c_str());
 
        this->TreeRoot = new TreeServer(this, ServerInstance->Config->ServerName, ServerInstance->Config->ServerDesc, ServerInstance->Config->GetSID());
        this->ReadConfiguration();
@@ -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);
@@ -321,7 +298,7 @@ void SpanningTreeUtilities::RefreshIPCache()
                Link* L = *i;
                if (!L->Port)
                {
-                       ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"m_spanningtree: Ignoring a link block without a port.");
+                       ServerInstance->Logs->Log("m_spanningtree",LOG_DEFAULT,"m_spanningtree: Ignoring a link block without a port.");
                        /* Invalid link block */
                        continue;
                }
@@ -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;
@@ -374,7 +351,8 @@ void SpanningTreeUtilities::ReadConfiguration()
        {
                ConfigTag* tag = i->second;
                reference<Link> L = new Link(tag);
-               L->Name = tag->getString("name").c_str();
+               std::string linkname = tag->getString("name");
+               L->Name = linkname.c_str();
                L->AllowMask = tag->getString("allowmask");
                L->IPAddr = tag->getString("ipaddr");
                L->Port = tag->getInt("port");
@@ -411,11 +389,11 @@ void SpanningTreeUtilities::ReadConfiguration()
                if (L->IPAddr.empty())
                {
                        L->IPAddr = "*";
-                       ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Configuration warning: Link block '" + assign(L->Name) + "' has no IP defined! This will allow any IP to connect as this server, and MAY not be what you want.");
+                       ServerInstance->Logs->Log("m_spanningtree",LOG_DEFAULT,"Configuration warning: Link block '" + assign(L->Name) + "' has no IP defined! This will allow any IP to connect as this server, and MAY not be what you want.");
                }
 
                if (!L->Port)
-                       ServerInstance->Logs->Log("m_spanningtree",DEFAULT,"Configuration warning: Link block '" + assign(L->Name) + "' has no port defined, you will not be able to /connect it.");
+                       ServerInstance->Logs->Log("m_spanningtree",LOG_DEFAULT,"Configuration warning: Link block '" + assign(L->Name) + "' has no port defined, you will not be able to /connect it.");
 
                L->Fingerprint.erase(std::remove(L->Fingerprint.begin(), L->Fingerprint.end(), ':'), L->Fingerprint.end());
                LinkBlocks.push_back(L);