Add a typedef for the data provider map.

[user/henk/code/inspircd.git] / src / coremods / core_dns.cpp

diff --git a/src/coremods/core_dns.cpp b/src/coremods/core_dns.cpp
index c736034bf68c497b394106bb83d21df2c6ab98a9..11c2c823c890b785641c22459b7734ad21c94ff6 100644 (file)
--- a/src/coremods/core_dns.cpp
+++ b/src/coremods/core_dns.cpp
@@ -1,8 +1,10 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
- *   Copyright (C) 2013 Adam <Adam@anope.org>
- *   Copyright (C) 2003-2013 Anope Team <team@anope.org>
+ *   Copyright (C) 2019 Robby <robby@chatbelgie.be>
+ *   Copyright (C) 2015, 2017-2020 Sadie Powell <sadie@witchery.services>
+ *   Copyright (C) 2013-2016 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2013, 2015-2016 Adam <Adam@anope.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -680,28 +682,34 @@ class MyManager : public Manager, public Timer, public EventHandler
 
        bool Tick(time_t now) CXX11_OVERRIDE
        {
-               ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "cache: purging DNS cache");
-
+               unsigned long expired = 0;
                for (cache_map::iterator it = this->cache.begin(); it != this->cache.end(); )
                {
                        const Query& query = it->second;
                        if (IsExpired(query, now))
+                       {
+                               expired++;
                                this->cache.erase(it++);
+                       }
                        else
                                ++it;
                }
+
+               if (expired)
+                       ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "cache: purged %lu expired DNS entries", expired);
+
                return true;
        }
 
        void Rehash(const std::string& dnsserver, std::string sourceaddr, unsigned int sourceport)
        {
-               if (this->GetFd() > -1)
+               if (this->HasFd())
                {
                        SocketEngine::Shutdown(this, 2);
                        SocketEngine::Close(this);
 
-                       /* Remove expired entries from the cache */
-                       this->Tick(ServerInstance->Time());
+                       // Remove all entries from the cache.
+                       cache.clear();
                }
 
                irc::sockets::aptosa(dnsserver, DNS::PORT, myserver);