Add ConfigTag::getDuration() with optional bounds checking

[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 d6433f14243306f948a94bdfe11123166d5d630f..becc7a6e85d59762b01886b1d0c544d8386d1d4a 100644 (file)
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -118,13 +118,13 @@ class DNSBLResolver : public DNS::Request
                                        if (!ConfEntry->ident.empty())
                                        {
                                                them->WriteServ("304 " + them->nick + " :Your ident has been set to " + ConfEntry->ident + " because you matched " + reason);
-                                               them->ChangeIdent(ConfEntry->ident.c_str());
+                                               them->ChangeIdent(ConfEntry->ident);
                                        }
 
                                        if (!ConfEntry->host.empty())
                                        {
                                                them->WriteServ("304 " + them->nick + " :Your host has been set to " + ConfEntry->host + " because you matched " + reason);
-                                               them->ChangeDisplayedHost(ConfEntry->host.c_str());
+                                               them->ChangeDisplayedHost(ConfEntry->host);
                                        }
 
                                        nameExt.set(them, ConfEntry->name);
@@ -289,7 +289,7 @@ class ModuleDNSBL : public Module
                        }
 
                        e->banaction = str2banaction(tag->getString("action"));
-                       e->duration = InspIRCd::Duration(tag->getString("duration", "60"));
+                       e->duration = tag->getDuration("duration", 60, 1);
 
                        /* Use portparser for record replies */
 
@@ -314,11 +314,6 @@ class ModuleDNSBL : public Module
                                std::string location = tag->getTagLocation();
                                ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(%s): Invalid banaction", location.c_str());
                        }
-                       else if (e->duration <= 0)
-                       {
-                               std::string location = tag->getTagLocation();
-                               ServerInstance->SNO->WriteGlobalSno('a', "DNSBL(%s): Invalid duration", location.c_str());
-                       }
                        else
                        {
                                if (e->reason.empty())
@@ -356,11 +351,11 @@ class ModuleDNSBL : public Module
                else
                        ServerInstance->Logs->Log(MODNAME, LOG_DEBUG, "User has no connect class in OnSetUserIP");
 
-               unsigned char a, b, c, d;
-               d = (unsigned char) (user->client_sa.in4.sin_addr.s_addr >> 24) & 0xFF;
-               c = (unsigned char) (user->client_sa.in4.sin_addr.s_addr >> 16) & 0xFF;
-               b = (unsigned char) (user->client_sa.in4.sin_addr.s_addr >> 8) & 0xFF;
-               a = (unsigned char) user->client_sa.in4.sin_addr.s_addr & 0xFF;
+               unsigned int a, b, c, d;
+               d = (unsigned int) (user->client_sa.in4.sin_addr.s_addr >> 24) & 0xFF;
+               c = (unsigned int) (user->client_sa.in4.sin_addr.s_addr >> 16) & 0xFF;
+               b = (unsigned int) (user->client_sa.in4.sin_addr.s_addr >> 8) & 0xFF;
+               a = (unsigned int) user->client_sa.in4.sin_addr.s_addr & 0xFF;
 
                const std::string reversedip = ConvToStr(d) + "." + ConvToStr(c) + "." + ConvToStr(b) + "." + ConvToStr(a);