m_spanningtree Remove unneeded #includes

[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 5e02dd0a5dadc5cea64d99375285f24a5a8bb5e6..8429eb21b1eea19d67ae7f4cf108193bcd91d4b4 100644 (file)
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -40,7 +40,6 @@ class DNSBLConfEntry
                unsigned char records[256];
                unsigned long stats_hits, stats_misses;
                DNSBLConfEntry(): type(A_BITMASK),duration(86400),bitmask(0),stats_hits(0), stats_misses(0) {}
-               ~DNSBLConfEntry() { }
 };
 
 
@@ -137,7 +136,7 @@ class DNSBLResolver : public Resolver
                                                        {
                                                                std::string timestr = ServerInstance->TimeString(kl->expiry);
                                                                ServerInstance->SNO->WriteGlobalSno('x',"K:line added due to DNSBL match on *@%s to expire on %s: %s",
-                                                                       them->GetIPString(), timestr.c_str(), reason.c_str());
+                                                                       them->GetIPString().c_str(), timestr.c_str(), reason.c_str());
                                                                ServerInstance->XLines->ApplyLines();
                                                        }
                                                        else
@@ -152,7 +151,7 @@ class DNSBLResolver : public Resolver
                                                        {
                                                                std::string timestr = ServerInstance->TimeString(gl->expiry);
                                                                ServerInstance->SNO->WriteGlobalSno('x',"G:line added due to DNSBL match on *@%s to expire on %s: %s",
-                                                                       them->GetIPString(), timestr.c_str(), reason.c_str());
+                                                                       them->GetIPString().c_str(), timestr.c_str(), reason.c_str());
                                                                ServerInstance->XLines->ApplyLines();
                                                        }
                                                        else
@@ -167,7 +166,7 @@ class DNSBLResolver : public Resolver
                                                        {
                                                                std::string timestr = ServerInstance->TimeString(zl->expiry);
                                                                ServerInstance->SNO->WriteGlobalSno('x',"Z:line added due to DNSBL match on *@%s to expire on %s: %s",
-                                                                       them->GetIPString(), timestr.c_str(), reason.c_str());
+                                                                       them->GetIPString().c_str(), timestr.c_str(), reason.c_str());
                                                                ServerInstance->XLines->ApplyLines();
                                                        }
                                                        else
@@ -201,10 +200,6 @@ class DNSBLResolver : public Resolver
                                countExt.set(them, i - 1);
                }
        }
-
-       virtual ~DNSBLResolver()
-       {
-       }
 };
 
 class ModuleDNSBL : public Module
@@ -296,7 +291,7 @@ class ModuleDNSBL : public Module
                        }
 
                        e->banaction = str2banaction(tag->getString("action"));
-                       e->duration = ServerInstance->Duration(tag->getString("duration", "60"));
+                       e->duration = InspIRCd::Duration(tag->getString("duration", "60"));
 
                        /* Use portparser for record replies */
 
@@ -361,7 +356,7 @@ class ModuleDNSBL : public Module
                                return;
                }
                else
-                       ServerInstance->Logs->Log("m_dnsbl", DEBUG, "User has no connect class in OnSetUserIP");
+                       ServerInstance->Logs->Log("m_dnsbl", LOG_DEBUG, "User has no connect class in OnSetUserIP");
 
                unsigned char a, b, c, d;
                char reversedipbuf[128];
@@ -405,7 +400,7 @@ class ModuleDNSBL : public Module
                        return MOD_RES_PASSTHRU;
                return MOD_RES_DENY;
        }
-       
+
        ModResult OnCheckReady(LocalUser *user)
        {
                if (countExt.get(user))