Purge code for Windows XP and MSVC pre-2015.

[user/henk/code/inspircd.git] / src / modules / m_dnsbl.cpp

diff --git a/src/modules/m_dnsbl.cpp b/src/modules/m_dnsbl.cpp
index 5eaa8c279abce71526b1ff611930d2e89f503163..b2b9c30ffd165d6fb19a9672a40c60d142915a1f 100644 (file)
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -66,7 +66,17 @@ class DNSBLResolver : public DNS::Request
                if (!them)
                        return;
 
-               const DNS::ResourceRecord &ans_record = r->answers[0];
+               const DNS::ResourceRecord* const ans_record = r->FindAnswerOfType(DNS::QUERY_A);
+               if (!ans_record)
+                       return;
+
+               // All replies should be in 127.0.0.0/8
+               if (ans_record->rdata.compare(0, 4, "127.") != 0)
+               {
+                       ServerInstance->SNO->WriteGlobalSno('a', "DNSBL: %s returned address outside of acceptable subnet 127.0.0.0/8: %s", ConfEntry->domain.c_str(), ans_record->rdata.c_str());
+                       ConfEntry->stats_misses++;
+                       return;
+               }
 
                int i = countExt.get(them);
                if (i)
@@ -78,7 +88,7 @@ class DNSBLResolver : public DNS::Request
                bool match = false;
                in_addr resultip;
 
-               inet_aton(ans_record.rdata.c_str(), &resultip);
+               inet_pton(AF_INET, ans_record->rdata.c_str(), &resultip);
 
                switch (ConfEntry->type)
                {
@@ -117,13 +127,13 @@ class DNSBLResolver : public DNS::Request
                                {
                                        if (!ConfEntry->ident.empty())
                                        {
-                                               them->WriteNumeric(304, ":Your ident has been set to " + ConfEntry->ident + " because you matched " + reason);
+                                               them->WriteNumeric(304, "Your ident has been set to " + ConfEntry->ident + " because you matched " + reason);
                                                them->ChangeIdent(ConfEntry->ident);
                                        }
 
                                        if (!ConfEntry->host.empty())
                                        {
-                                               them->WriteNumeric(304, ":Your host has been set to " + ConfEntry->host + " because you matched " + reason);
+                                               them->WriteNumeric(304, "Your host has been set to " + ConfEntry->host + " because you matched " + reason);
                                                them->ChangeDisplayedHost(ConfEntry->host);
                                        }
 
@@ -173,7 +183,7 @@ class DNSBLResolver : public DNS::Request
                                        if (ServerInstance->XLines->AddLine(zl,NULL))
                                        {
                                                std::string timestr = InspIRCd::TimeString(zl->expiry);
-                                               ServerInstance->SNO->WriteGlobalSno('x',"Z:line added due to DNSBL match on *@%s to expire on %s: %s",
+                                               ServerInstance->SNO->WriteGlobalSno('x',"Z:line added due to DNSBL match on %s to expire on %s: %s",
                                                        them->GetIPString().c_str(), timestr.c_str(), reason.c_str());
                                                ServerInstance->XLines->ApplyLines();
                                        }
@@ -406,9 +416,9 @@ class ModuleDNSBL : public Module
                return MOD_RES_PASSTHRU;
        }
 
-       ModResult OnStats(char symbol, User* user, string_list &results) CXX11_OVERRIDE
+       ModResult OnStats(Stats::Context& stats) CXX11_OVERRIDE
        {
-               if (symbol != 'd')
+               if (stats.GetSymbol() != 'd')
                        return MOD_RES_PASSTHRU;
 
                unsigned long total_hits = 0, total_misses = 0;
@@ -418,12 +428,12 @@ class ModuleDNSBL : public Module
                        total_hits += (*i)->stats_hits;
                        total_misses += (*i)->stats_misses;
 
-                       results.push_back("304 " + user->nick + " :DNSBLSTATS DNSbl \"" + (*i)->name + "\" had " +
+                       stats.AddRow(304, "DNSBLSTATS DNSbl \"" + (*i)->name + "\" had " +
                                        ConvToStr((*i)->stats_hits) + " hits and " + ConvToStr((*i)->stats_misses) + " misses");
                }
 
-               results.push_back("304 " + user->nick + " :DNSBLSTATS Total hits: " + ConvToStr(total_hits));
-               results.push_back("304 " + user->nick + " :DNSBLSTATS Total misses: " + ConvToStr(total_misses));
+               stats.AddRow(304, "DNSBLSTATS Total hits: " + ConvToStr(total_hits));
+               stats.AddRow(304, "DNSBLSTATS Total misses: " + ConvToStr(total_misses));
 
                return MOD_RES_PASSTHRU;
        }