Add config <options:disablehmac> to support disabling of HMAC, and tidy up to detect...

[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 6ea05e6fac78fb1ce61de1f5dd1eaa1969dcc1be..c2f666c7ec1202cd24c56069a61dfcdd4d8af8b2 100644 (file)
--- a/src/modules/m_dnsbl.cpp
+++ b/src/modules/m_dnsbl.cpp
@@ -34,6 +34,7 @@ class DNSBLConfEntry
                long duration;
                int bitmask;
                DNSBLConfEntry(): duration(86400),bitmask(0) {}
+               ~DNSBLConfEntry() { }
 };
 
 
@@ -63,29 +64,14 @@ class DNSBLResolver : public Resolver
                        if(result.length())
                        {
                                unsigned int bitmask=0;
-                               unsigned int octetpos=0;
-                               std::string tmp = result;
+                               in_addr resultip;
 
-                               while(tmp.length()>0)
-                               {
-                                       std::string octet;
-                                       /* Fix by brain, npos is -1, so unsigned int will never match */
-                                       std::string::size_type lastdot = tmp.rfind(".");
-
-                                       if (lastdot == std::string::npos)
-                                       {
-                                               octet=tmp;
-                                               tmp.clear();
-                                       }
-                                       else
-                                       {
-                                               octet=tmp.substr(lastdot+1,tmp.length()-lastdot+1);
-                                               tmp.resize(lastdot);
-                                       }
-
-                                       bitmask += (256 ^ octetpos) * atoi(octet.c_str());
-                                       octetpos += 1;
-                               }
+                               /* Convert the result to an in_addr (we can gaurantee we got ipv4)
+                                * Whoever did the loop that was here before, I AM CONFISCATING
+                                * YOUR CRACKPIPE. you know who you are. -- Brain
+                                */
+                               inet_aton(result.c_str(), &resultip);
+                               bitmask = resultip.s_addr >> 24; /* Last octet (network byte order */
 
                                bitmask &= ConfEntry->bitmask;
 
@@ -112,16 +98,19 @@ class DNSBLResolver : public Resolver
                                                case DNSBLConfEntry::I_KLINE:
                                                {
                                                        ServerInstance->AddKLine(ConfEntry->duration, ServerInstance->Config->ServerName, reason, std::string("*@") + them->GetIPString());
+                                                       FOREACH_MOD(I_OnAddKLine,OnAddKLine(ConfEntry->duration, NULL, reason, std::string("*@") + them->GetIPString()));
                                                        break;
                                                }
                                                case DNSBLConfEntry::I_GLINE:
                                                {
                                                        ServerInstance->AddGLine(ConfEntry->duration, ServerInstance->Config->ServerName, reason, std::string("*@") + them->GetIPString());
+                                                       FOREACH_MOD(I_OnAddGLine,OnAddGLine(ConfEntry->duration, NULL, reason, std::string("*@") + them->GetIPString()));
                                                        break;
                                                }
                                                case DNSBLConfEntry::I_ZLINE:
                                                {
                                                        ServerInstance->AddZLine(ConfEntry->duration, ServerInstance->Config->ServerName, reason, them->GetIPString());
+                                                       FOREACH_MOD(I_OnAddZLine,OnAddZLine(ConfEntry->duration, NULL, reason, them->GetIPString()));
                                                        break;
                                                }
                                                case DNSBLConfEntry::I_UNKNOWN:
@@ -191,11 +180,9 @@ class ModuleDNSBL : public Module
        void ClearEntries()
        {
                std::vector<DNSBLConfEntry *>::iterator i;
-               while ((i = DNSBLConfEntries.begin()) != DNSBLConfEntries.end())
-               {
-                       DNSBLConfEntries.erase(i);
+               for (std::vector<DNSBLConfEntry *>::iterator i = DNSBLConfEntries.begin(); i != DNSBLConfEntries.end(); i++)
                        delete *i;
-               }
+               DNSBLConfEntries.clear();
        }
 
        /** Fill our conf vector with data
@@ -278,7 +265,7 @@ class ModuleDNSBL : public Module
                                /* We could have an ipv6 address here */
                                std::string x = user->GetIPString();
                                /* Is it a 4in6 address? (Compensate for this kernel kludge that people love) */
-                               if (x.find("0::ffff:") == x.begin())
+                               if (x.find("0::ffff:") == 0)
                                {
                                        x.erase(x.begin(), x.begin() + 8);
                                        if (inet_aton(x.c_str(), &in))