cmd_stats List opers without iterating the whole userlist

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

diff --git a/src/dns.cpp b/src/dns.cpp
index 17641c585be5de1d320c868a9c669dfc9861d2df..63bde0eccb46e5819b213d33f71df21f8d4cf32a 100644 (file)
--- a/src/dns.cpp
+++ b/src/dns.cpp
@@ -34,7 +34,7 @@ Please do not assume that firedns works like this,
 looks like this, walks like this or tastes like this.
 */
 
-#ifndef WIN32
+#ifndef _WIN32
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <errno.h>
@@ -258,8 +258,28 @@ DNSRequest* DNS::AddQuery(DNSHeader *header, int &id, const char* original)
                return NULL;
 
        /* Create an id */
+       unsigned int tries = 0;
        do {
                id = ServerInstance->GenRandomInt(DNS::MAX_REQUEST_ID);
+               if (++tries == DNS::MAX_REQUEST_ID*5)
+               {
+                       // If we couldn't find an empty slot this many times, do a sequential scan as a last
+                       // resort. If an empty slot is found that way, go on, otherwise throw an exception
+                       id = -1;
+                       for (int i = 0; i < DNS::MAX_REQUEST_ID; i++)
+                       {
+                               if (!requests[i])
+                               {
+                                       id = i;
+                                       break;
+                               }
+                       }
+
+                       if (id == -1)
+                               throw ModuleException("DNS: All ids are in use");
+
+                       break;
+               }
        } while (requests[id]);
 
        DNSRequest* req = new DNSRequest(this, id, original);
@@ -371,10 +391,6 @@ DNS::DNS()
        /* Clear the requests class table */
        memset(requests,0,sizeof(requests));
 
-       /* Set the id of the next request to 0
-        */
-       currid = 0;
-
        /* DNS::Rehash() sets this to a valid ptr
         */
        this->cache = NULL;
@@ -596,8 +612,10 @@ DNSResult DNS::GetResult()
         */
        if (from != myserver)
        {
+               std::string server1 = from.str();
+               std::string server2 = myserver.str();
                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());
+                       server1.c_str(), server2.c_str());
                return DNSResult(-1,"",0,"");
        }
 
@@ -1066,20 +1084,13 @@ bool DNS::AddResolverClass(Resolver* r)
                        Classes[r->GetId()] = r;
                        return true;
                }
-               else
-                       /* Duplicate id */
-                       return false;
        }
-       else
-       {
-               /* Pointer or id not valid.
-                * Free the item and return
-                */
-               if (r)
-                       delete r;
 
-               return false;
-       }
+       /* Pointer or id not valid, or duplicate id.
+        * Free the item and return
+        */
+       delete r;
+       return false;
 }
 
 void DNS::CleanResolvers(Module* module)