Fixed strhashcomp

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

diff --git a/src/dnsqueue.cpp b/src/dnsqueue.cpp
index 58d55c1a5aad717e797227ddeb1a50c61879daa5..80189a95e17f4815883158950e8dad92873df0f9 100644 (file)
--- a/src/dnsqueue.cpp
+++ b/src/dnsqueue.cpp
@@ -127,6 +127,8 @@ struct StrHashComp
                char a[MAXBUF],b[MAXBUF];
                strlcpy(a,s1.c_str(),MAXBUF);
                strlcpy(b,s2.c_str(),MAXBUF);
+                strlower(a);
+                strlower(b);
                return (strcasecmp(a,b) == 0);
        }
 
@@ -162,52 +164,52 @@ extern command_table cmdlist;
 extern ClassVector Classes;
 
 extern char DNSServer[MAXBUF];
+long max_fd_alloc = 0;
+
+extern time_t TIME;
 
 class Lookup {
 private:
-       DNS* resolver;
+       DNS resolver;
        char u[NICKMAX];
 public:
        Lookup()
        {
                strcpy(u,"");
-               resolver = NULL;
        }
 
        void Reset()
        {
                strcpy(u,"");
-               if (resolver)
-                       delete resolver;
-               resolver = NULL;
        }
 
        ~Lookup()
        {
-               if (resolver)
-                       delete resolver;
        }
 
-       Lookup(std::string nick)
+       bool DoLookup(std::string nick)
        {
                userrec* usr = Find(nick);
                if (usr)
                {
                        log(DEBUG,"New Lookup class for %s with DNSServer set to '%s'",nick.c_str(),DNSServer);
-                       resolver = new DNS(std::string(DNSServer));
-                       resolver->ReverseLookup(std::string(usr->host));
+                       resolver.SetNS(std::string(DNSServer));
+                       if (!resolver.ReverseLookup(std::string(usr->host)))
+                               return false;
                        strlcpy(u,nick.c_str(),NICKMAX);
+                       return true;
                }
+               return false;
        }
 
        bool Done()
        {
                userrec* usr = NULL;
-               if (resolver->HasResult())
+               if (resolver.HasResult())
                {
-                       if (resolver->GetFD() != 0)
+                       if (resolver.GetFD() != 0)
                        {
-                               std::string hostname = resolver->GetResult();
+                               std::string hostname = resolver.GetResult();
                                usr = Find(u);
                                if (usr)
                                {
@@ -219,6 +221,7 @@ public:
                                        if ((hostname != "") && (usr->registered != 7))
                                        {
                                                strlcpy(usr->host,hostname.c_str(),MAXBUF);
+                                               strlcpy(usr->dhost,hostname.c_str(),MAXBUF);
                                                WriteServ(usr->fd,"NOTICE Auth :Resolved your hostname: %s",hostname.c_str());
                                                usr->dns_done = true;
                                                return true;
@@ -229,7 +232,9 @@ public:
                        }
                        else
                        {
-                               usr->dns_done = true;
+                               usr = Find(u);
+                               if (usr)
+                                       usr->dns_done = true;
                                return true;
                        }
                }
@@ -239,11 +244,11 @@ public:
        int GetFD()
        {
                userrec* usr = Find(u);
-               if (usr)
-               {
-                       return usr->fd;
-               }
-               else return 0;
+               if (!usr)
+                       return 0;
+               if (usr->dns_done)
+                       return 0;
+               return usr->fd;
        }
 };
 
@@ -257,14 +262,25 @@ bool lookup_dns(std::string nick)
                // place a new user into the queue...
                log(DEBUG,"Queueing DNS lookup for %s",u->nick);
                WriteServ(u->fd,"NOTICE Auth :Looking up your hostname...");
-               Lookup L(nick);
-               for (int j = 0; j < MAXBUF; j++)
+               Lookup L;
+               if (L.DoLookup(nick))
                {
-                       if (!dnsq[j].GetFD())
+                       for (int j = 0; j < MAXBUF; j++)
                        {
-                               dnsq[j] = L;
-                               return true;
+                               if (!dnsq[j].GetFD())
+                               {
+                                       dnsq[j] = L;
+                                       return true;
+                               }
                        }
+                       // calculate the maximum value, this saves cpu time later
+                       for (int p = 0; p < MAXBUF; p++)
+                               if (dnsq[p].GetFD())
+                                       max_fd_alloc = p;
+               }
+               else
+               {
+                       return false;
                }
        }
        return false;
@@ -273,7 +289,7 @@ bool lookup_dns(std::string nick)
 void dns_poll()
 {
        // do we have items in the queue?
-       for (int j = 0; j < MAXBUF; j++)
+       for (int j = 0; j <= max_fd_alloc; j++)
        {
                // are any ready, or stale?
                if (dnsq[j].GetFD())
@@ -283,7 +299,12 @@ void dns_poll()
                                dnsq[j].Reset();
                        }
                }
-               else dnsq[j].Reset();
        }
+       // looks like someones freed an item, recalculate end of list.
+       if ((!dnsq[max_fd_alloc].GetFD()) && (max_fd_alloc != 0))
+               for (int p = 0; p < MAXBUF; p++)
+                       if (dnsq[p].GetFD())
+                               max_fd_alloc = p;
+
 }