Fixes to way allocations are handled

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

diff --git a/src/dnsqueue.cpp b/src/dnsqueue.cpp
index ddc6993f0987fde286def1e43335313b8ad59945..1e1aa33c85a75d5c9412cb23a6c02b7723ac10e5 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);
        }
 
@@ -164,29 +166,25 @@ 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;
        }
 
        bool DoLookup(std::string nick)
@@ -195,8 +193,8 @@ public:
                if (usr)
                {
                        log(DEBUG,"New Lookup class for %s with DNSServer set to '%s'",nick.c_str(),DNSServer);
-                       resolver = new DNS(std::string(DNSServer));
-                       if (!resolver->ReverseLookup(std::string(usr->host)))
+                       resolver.SetNS(DNSServer);
+                       if (!resolver.ReverseLookup(usr->host))
                                return false;
                        strlcpy(u,nick.c_str(),NICKMAX);
                        return true;
@@ -207,11 +205,11 @@ public:
        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)
                                {