Improve LIST and implement more extended list features.

[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 c95d42ea3b7349009487d4b6ba2063681f3d909b..1040bb036736b57794529b2256f9b6e875f7d403 100644 (file)
--- a/src/coremods/core_dns.cpp
+++ b/src/coremods/core_dns.cpp
@@ -154,7 +154,7 @@ class Packet : public Query
                record.ttl = (input[pos] << 24) | (input[pos + 1] << 16) | (input[pos + 2] << 8) | input[pos + 3];
                pos += 4;
 
-               //record.rdlength = input[pos] << 8 | input[pos + 1];
+               uint16_t rdlength = input[pos] << 8 | input[pos + 1];
                pos += 2;
 
                switch (record.type)
@@ -200,6 +200,19 @@ class Packet : public Query
 
                                break;
                        }
+                       case QUERY_TXT:
+                       {
+                               if (pos + rdlength > input_size)
+                                       throw Exception("Unable to unpack txt resource record");
+
+                               record.rdata = std::string(reinterpret_cast<const char *>(input + pos), rdlength);
+                               pos += rdlength;
+
+                               if (record.rdata.find_first_of("\r\n\0", 0, 3) != std::string::npos)
+                                       throw Exception("Invalid character in txt record");
+
+                               break;
+                       }
                        default:
                                break;
                }
@@ -338,6 +351,7 @@ class MyManager : public Manager, public Timer, public EventHandler
        cache_map cache;
 
        irc::sockets::sockaddrs myserver;
+       bool unloading;
 
        /** Maximum number of entries in cache
         */
@@ -402,6 +416,7 @@ class MyManager : public Manager, public Timer, public EventHandler
        DNS::Request* requests[MAX_REQUEST_ID+1];
 
        MyManager(Module* c) : Manager(c), Timer(5*60, true)
+               , unloading(false)
        {
                for (unsigned int i = 0; i <= MAX_REQUEST_ID; ++i)
                        requests[i] = NULL;
@@ -410,6 +425,9 @@ class MyManager : public Manager, public Timer, public EventHandler
 
        ~MyManager()
        {
+               // Ensure Process() will fail for new requests
+               unloading = true;
+
                for (unsigned int i = 0; i <= MAX_REQUEST_ID; ++i)
                {
                        DNS::Request* request = requests[i];
@@ -424,8 +442,11 @@ class MyManager : public Manager, public Timer, public EventHandler
                }
        }
 
-       void Process(DNS::Request* req)
+       void Process(DNS::Request* req) CXX11_OVERRIDE
        {
+               if ((unloading) || (req->creator->dying))
+                       throw Exception("Module is being unloaded");
+
                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 */
@@ -488,13 +509,13 @@ class MyManager : public Manager, public Timer, public EventHandler
                ServerInstance->Timers.AddTimer(req);
        }
 
-       void RemoveRequest(DNS::Request* req)
+       void RemoveRequest(DNS::Request* req) CXX11_OVERRIDE
        {
                if (requests[req->id] == req)
                        requests[req->id] = NULL;
        }
 
-       std::string GetErrorStr(Error e)
+       std::string GetErrorStr(Error e) CXX11_OVERRIDE
        {
                switch (e)
                {
@@ -643,7 +664,7 @@ class MyManager : public Manager, public Timer, public EventHandler
                delete request;
        }
 
-       bool Tick(time_t now)
+       bool Tick(time_t now) CXX11_OVERRIDE
        {
                ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "cache: purging DNS cache");
 
@@ -805,7 +826,7 @@ class ModuleDNS : public Module
                        this->manager.Rehash(DNSServer, SourceIP, SourcePort);
        }
 
-       void OnUnloadModule(Module* mod)
+       void OnUnloadModule(Module* mod) CXX11_OVERRIDE
        {
                for (unsigned int i = 0; i <= MAX_REQUEST_ID; ++i)
                {
@@ -824,7 +845,7 @@ class ModuleDNS : public Module
                }
        }
 
-       Version GetVersion()
+       Version GetVersion() CXX11_OVERRIDE
        {
                return Version("DNS support", VF_CORE|VF_VENDOR);
        }