Allow commands to optionally route themselves using ENCAP

[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 78d2478b069dc8f53f1e161693c6f42f30a6ea35..7fb652cf715ffa8ee7cd012398fa975dcc45b4b3 100644 (file)
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -60,12 +60,8 @@ class DNSBLResolver : public Resolver
        }
 
        /* Note: This may be called multiple times for multiple A record results */
-       virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum = 0)
+       virtual void OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
        {
-               /* for bitmask reply types, we arent interested in any but the first result (number 0) */
-               if ((ConfEntry->type == DNSBLConfEntry::A_BITMASK) && (resultnum))
-                       return;
-
                /* Check the user still exists */
                if ((them) && (them == ServerInstance->SE->GetRef(theirfd)))
                {
@@ -117,6 +113,8 @@ class DNSBLResolver : public Resolver
                                                                        "*", them->GetIPString());
                                                        if (ServerInstance->XLines->AddLine(kl,NULL))
                                                        {
+                                                               ServerInstance->SNO->WriteToSnoMask('x',"m_dnsbl added K:line on *@%s to expire on %s (%s).", 
+                                                                       them->GetIPString(), ServerInstance->TimeString(kl->expiry).c_str(), reason.c_str());
                                                                ServerInstance->XLines->ApplyLines();
                                                        }
                                                        else
@@ -129,6 +127,8 @@ class DNSBLResolver : public Resolver
                                                                        "*", them->GetIPString());
                                                        if (ServerInstance->XLines->AddLine(gl,NULL))
                                                        {
+                                                               ServerInstance->SNO->WriteToSnoMask('x',"m_dnsbl added G:line on *@%s to expire on %s (%s).", 
+                                                                       them->GetIPString(), ServerInstance->TimeString(gl->expiry).c_str(), reason.c_str());
                                                                ServerInstance->XLines->ApplyLines();
                                                        }
                                                        else
@@ -141,6 +141,8 @@ class DNSBLResolver : public Resolver
                                                                        them->GetIPString());
                                                        if (ServerInstance->XLines->AddLine(zl,NULL))
                                                        {
+                                                               ServerInstance->SNO->WriteToSnoMask('x',"m_dnsbl added Z:line on *@%s to expire on %s (%s).", 
+                                                                       them->GetIPString(), ServerInstance->TimeString(zl->expiry).c_str(), reason.c_str());
                                                                ServerInstance->XLines->ApplyLines();
                                                        }
                                                        else
@@ -253,7 +255,7 @@ class ModuleDNSBL : public Module
                        }
 
                        e->banaction = str2banaction(MyConf->ReadValue("dnsbl", "action", i));
-                       e->duration = ServerInstance->Duration(MyConf->ReadValue("dnsbl", "duration", i));
+                       e->duration = ServerInstance->Duration(MyConf->ReadValue("dnsbl", "duration", "60", i));
 
                        /* Use portparser for record replies */
 
@@ -274,6 +276,10 @@ class ModuleDNSBL : public Module
                        {
                                ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(#%d): Invalid banaction", i);
                        }
+                       else if (e->duration <= 0)
+                       {
+                               ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(#%d): Invalid duration", i);
+                       }
                        else
                        {
                                if (e->reason.empty())
@@ -294,7 +300,7 @@ class ModuleDNSBL : public Module
                delete MyConf;
        }
 
-       virtual void OnRehash(User* user, const std::string &parameter)
+       virtual void OnRehash(User* user)
        {
                ReadConf();
        }