Remove unnecessary chdirs in the helper script.

[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..dbfb0b5828efa4d0b4cacdeb3edf970c4d38ac0a 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
@@ -421,6 +423,7 @@ class MyManager : public Manager, public Timer, public EventHandler
        ~MyManager()
        {
                // Ensure Process() will fail for new requests
+               Close();
                unloading = true;
 
                for (unsigned int i = 0; i <= MAX_REQUEST_ID; ++i)
@@ -437,11 +440,32 @@ class MyManager : public Manager, public Timer, public EventHandler
                }
        }
 
+       void Close()
+       {
+               // Shutdown the socket if it exists.
+               if (HasFd())
+               {
+                       SocketEngine::Shutdown(this, 2);
+                       SocketEngine::Close(this);
+               }
+
+               // Remove all entries from the cache.
+               cache.clear();
+       }
+
        void Process(DNS::Request* req) CXX11_OVERRIDE
        {
                if ((unloading) || (req->creator->dying))
                        throw Exception("Module is being unloaded");
 
+               if (!HasFd())
+               {
+                       Query rr(req->question);
+                       rr.error = ERROR_DISABLED;
+                       req->OnError(&rr);
+                       return;
+               }
+
                ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "Processing request to lookup " + req->question.name + " of type " + ConvToStr(req->question.type) + " to " + this->myserver.addr());
 
                /* Create an id */
@@ -531,6 +555,8 @@ class MyManager : public Manager, public Timer, public EventHandler
                        case ERROR_DOMAIN_NOT_FOUND:
                        case ERROR_NO_RECORDS:
                                return "Domain not found";
+                       case ERROR_DISABLED:
+                               return "DNS lookups are disabled";
                        case ERROR_NONE:
                        case ERROR_UNKNOWN:
                        default:
@@ -680,38 +706,36 @@ 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)
-               {
-                       SocketEngine::Shutdown(this, 2);
-                       SocketEngine::Close(this);
-
-                       /* Remove expired entries from the cache */
-                       this->Tick(ServerInstance->Time());
-               }
-
                irc::sockets::aptosa(dnsserver, DNS::PORT, myserver);
 
                /* Initialize mastersocket */
+               Close();
                int s = socket(myserver.family(), SOCK_DGRAM, 0);
                this->SetFd(s);
 
                /* Have we got a socket? */
-               if (this->GetFd() != -1)
+               if (this->HasFd())
                {
                        SocketEngine::SetReuse(s);
                        SocketEngine::NonBlocking(s);
@@ -824,13 +848,25 @@ class ModuleDNS : public Module
 
        void ReadConfig(ConfigStatus& status) CXX11_OVERRIDE
        {
-               std::string oldserver = DNSServer;
-               const std::string oldip = SourceIP;
-               const unsigned int oldport = SourcePort;
-
                ConfigTag* tag = ServerInstance->Config->ConfValue("dns");
+               if (!tag->getBool("enabled", true))
+               {
+                       // Clear these so they get reset if DNS is enabled again.
+                       DNSServer.clear();
+                       SourceIP.clear();
+                       SourcePort = 0;
+
+                       this->manager.Close();
+                       return;
+               }
+
+               const std::string oldserver = DNSServer;
                DNSServer = tag->getString("server");
+
+               const std::string oldip = SourceIP;
                SourceIP = tag->getString("sourceip");
+
+               const unsigned int oldport = SourcePort;
                SourcePort = tag->getUInt("sourceport", 0, 0, UINT16_MAX);
 
                if (DNSServer.empty())