Fix the pseudo-penalty hack that doesn't work properly

[user/henk/code/inspircd.git] / src / dns.cpp

diff --git a/src/dns.cpp b/src/dns.cpp
index 5efa6e9b96e61283d89e374f35705159e6f75b4b..945e1fb15c296577fce48a7c017fba18c0624f9d 100644 (file)
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -293,12 +293,9 @@ int DNS::PruneCache()
 
 void DNS::Rehash()
 {
-       int portpass = 0;
-
        if (this->GetFd() > -1)
        {
-               if (ServerInstance && ServerInstance->SE)
-                       ServerInstance->SE->DelFd(this);
+               ServerInstance->SE->DelFd(this);
                ServerInstance->SE->Shutdown(this, 2);
                ServerInstance->SE->Close(this);
                this->SetFd(-1);
@@ -323,29 +320,23 @@ void DNS::Rehash()
        {
                ServerInstance->SE->SetReuse(s);
                ServerInstance->SE->NonBlocking(s);
-               /* Bind the port - port 0 INADDR_ANY */
-               if (!ServerInstance->BindSocket(this->GetFd(), portpass, "", false))
+               irc::sockets::sockaddrs bindto;
+               memset(&bindto, 0, sizeof(bindto));
+               bindto.sa.sa_family = myserver.sa.sa_family;
+               if (ServerInstance->SE->Bind(this->GetFd(), bindto) < 0)
                {
                        /* Failed to bind */
-                       ServerInstance->Logs->Log("RESOLVER",DEBUG,"Error binding dns socket");
+                       ServerInstance->Logs->Log("RESOLVER",SPARSE,"Error binding dns socket - hostnames will NOT resolve");
                        ServerInstance->SE->Shutdown(this, 2);
                        ServerInstance->SE->Close(this);
                        this->SetFd(-1);
                }
-
-               if (this->GetFd() >= 0)
+               else if (!ServerInstance->SE->AddFd(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE))
                {
-                       /* Hook the descriptor into the socket engine */
-                       if (ServerInstance && ServerInstance->SE)
-                       {
-                               if (!ServerInstance->SE->AddFd(this, FD_WANT_POLL_READ | FD_WANT_NO_WRITE))
-                               {
-                                       ServerInstance->Logs->Log("RESOLVER",SPARSE,"Internal error starting DNS - hostnames will NOT resolve.");
-                                       ServerInstance->SE->Shutdown(this, 2);
-                                       ServerInstance->SE->Close(this);
-                                       this->SetFd(-1);
-                               }
-                       }
+                       ServerInstance->Logs->Log("RESOLVER",SPARSE,"Internal error starting DNS - hostnames will NOT resolve.");
+                       ServerInstance->SE->Shutdown(this, 2);
+                       ServerInstance->SE->Close(this);
+                       this->SetFd(-1);
                }
        }
        else
@@ -573,6 +564,7 @@ DNSResult DNS::GetResult()
        /* Did we get the whole header? */
        if (length < 12)
        {
+               ServerInstance->Logs->Log("RESOLVER",DEBUG,"GetResult didn't get a full packet (len=%d)", length);
                /* Nope - something screwed up. */
                return DNSResult(-1,"",0,"");
        }
@@ -586,8 +578,10 @@ DNSResult DNS::GetResult()
         *
         * -- Thanks jilles for pointing this one out.
         */
-       if (memcmp(&from, &myserver, sizeof(irc::sockets::sockaddrs)))
+       if (from != myserver)
        {
+               ServerInstance->Logs->Log("RESOLVER",DEBUG,"Got a result from the wrong server! Bad NAT or DNS forging attempt? '%s' != '%s'",
+                       from.str().c_str(), myserver.str().c_str());
                return DNSResult(-1,"",0,"");
        }
 
@@ -604,6 +598,7 @@ DNSResult DNS::GetResult()
        if (!requests[this_id])
        {
                /* Somehow we got a DNS response for a request we never made... */
+               ServerInstance->Logs->Log("RESOLVER",DEBUG,"Hmm, got a result that we didn't ask for (id=%lx). Ignoring.", this_id);
                return DNSResult(-1,"",0,"");
        }
        else