Add ConfigTag::getUInt for reading unsigned config 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 7ef20d202f25a1239d4e0701a54b5aff4866353b..f42822daa5da65c43a2f8268fc249fe19a8c2dd7 100644 (file)
--- a/src/modules/m_spanningtree/utils.cpp
+++ b/src/modules/m_spanningtree/utils.cpp
@@ -118,7 +118,7 @@ CullResult SpanningTreeUtilities::cull()
                sock->Close();
        }
 
-       for(std::map<TreeSocket*, std::pair<std::string, int> >::iterator i = timeoutlist.begin(); i != timeoutlist.end(); ++i)
+       for(TimeoutList::iterator i = timeoutlist.begin(); i != timeoutlist.end(); ++i)
        {
                TreeSocket* s = i->first;
                s->Close();
@@ -229,13 +229,10 @@ void SpanningTreeUtilities::ReadConfiguration()
        AnnounceTSChange = options->getBool("announcets");
        AllowOptCommon = options->getBool("allowmismatch");
        quiet_bursts = ServerInstance->Config->ConfValue("performance")->getBool("quietbursts");
-       PingWarnTime = options->getInt("pingwarning");
-       PingFreq = options->getInt("serverpingfreq");
+       PingWarnTime = options->getDuration("pingwarning", 15);
+       PingFreq = options->getDuration("serverpingfreq", 60, 1);
 
-       if (PingFreq == 0)
-               PingFreq = 60;
-
-       if (PingWarnTime < 0 || PingWarnTime > PingFreq - 1)
+       if (PingWarnTime >= PingFreq)
                PingWarnTime = 0;
 
        AutoconnectBlocks.clear();
@@ -253,7 +250,7 @@ void SpanningTreeUtilities::ReadConfiguration()
                        L->AllowMasks.push_back(s);
 
                L->IPAddr = tag->getString("ipaddr");
-               L->Port = tag->getInt("port");
+               L->Port = tag->getUInt("port", 0);
                L->SendPass = tag->getString("sendpass", tag->getString("password"));
                L->RecvPass = tag->getString("recvpass", tag->getString("password"));
                L->Fingerprint = tag->getString("fingerprint");
@@ -331,7 +328,7 @@ Link* SpanningTreeUtilities::FindLink(const std::string& name)
        for (std::vector<reference<Link> >::iterator i = LinkBlocks.begin(); i != LinkBlocks.end(); ++i)
        {
                Link* x = *i;
-               if (InspIRCd::Match(x->Name.c_str(), name.c_str(), rfc_case_insensitive_map))
+               if (InspIRCd::Match(x->Name, name, ascii_case_insensitive_map))
                {
                        return x;
                }