Fix test client error cheecking on result types

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

diff --git a/src/dnsqueue.cpp b/src/dnsqueue.cpp
index 8c9dbbb757fc4e67a7545e7ff22de69c2aa47946..fb0e0bd75999900c96170afed78f019b5253c63f 100644 (file)
--- a/src/dnsqueue.cpp
+++ b/src/dnsqueue.cpp
@@ -5,8 +5,8 @@
  *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
  *                       E-mail:
  *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
- *
+ *               <Craig@chatspike.net>
+ *     
  * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -38,16 +38,19 @@ extern InspIRCd* ServerInstance;
 class Lookup;
 
 Lookup* dnslist[MAX_DESCRIPTORS];
+Lookup* user_fd_to_dns[MAX_DESCRIPTORS];
+extern userrec* fd_ref_table[MAX_DESCRIPTORS];
 
 //enum LookupState { reverse, forward };
 
 class Lookup {
 private:
-       DNS resolver1;
-       DNS resolver2;
        char u[NICKMAX];
        std::string hostname;
 public:
+       DNS resolver1;
+       DNS resolver2;
+
        Lookup()
        {
                *u = 0;
@@ -71,18 +74,17 @@ public:
                if (usr)
                {
                        resolver1.SetNS(std::string(Config->DNSServer));
+                       if (!resolver1.ReverseLookup(std::string(usr->host), true))
                        {
                                return false;
                        }
                        strlcpy(u,nick.c_str(),NICKMAX-1);
 
-#ifndef THREADED_DNS
-                       usr->dns_fd = resolver1.GetFD();
-#endif
                        /* ASSOCIATE WITH DNS LOOKUP LIST */
                        if (resolver1.GetFD() != -1)
                        {
                                dnslist[resolver1.GetFD()] = this;
+                               user_fd_to_dns[usr->fd] = this;
                                return true;
                        }
                }
@@ -111,22 +113,20 @@ public:
                                                }
                                                if ((hostname != "") && (usr->registered != 7))
                                                {
-                                                       if ((std::string((char*)inet_ntoa(usr->ip4)) == ip) && (hostname.length() < 65))
+                                                       if ((std::string(inet_ntoa(usr->ip4)) == ip) && (hostname.length() < 65))
                                                        {
-                                                               strlcpy(usr->host,hostname.c_str(),64);
-                                                               strlcpy(usr->dhost,hostname.c_str(),64);
-                                                               /*address_cache::iterator address = addrcache.find(usr->ip4);
-                                                               if (address == addrcache.end())
+                                                               if ((hostname.find_last_of(".in-addr.arpa") == hostname.length() - 1) && (hostname.find_last_of(".in-addr.arpa") != std::string::npos))
+                                                               {
+                                                                       WriteServ(usr->fd,"NOTICE Auth :*** Your ISP are muppets -- reverse resolution resolves back to same reverse .arpa domain (!)");
+                                                               }
+                                                               else
                                                                {
-                                                                       log(DEBUG,"Caching hostname %s -> %s",(char*)inet_ntoa(usr->ip4),hostname.c_str());
-                                                                       addrcache[usr->ip4] = new std::string(hostname);
-                                                               }*/
-                                                               WriteServ(usr->fd,"NOTICE Auth :*** Found your hostname");
+                                                                       strlcpy(usr->host,hostname.c_str(),64);
+                                                                       strlcpy(usr->dhost,hostname.c_str(),64);
+                                                                       WriteServ(usr->fd,"NOTICE Auth :*** Found your hostname");
+                                                               }
                                                        }
                                                        usr->dns_done = true;
-#ifndef THREADED_DNS
-                                                       usr->dns_fd = -1;
-#endif
                                                        return true;
                                                }
                                        }
@@ -137,9 +137,6 @@ public:
                                        if (usr)
                                        {
                                                usr->dns_done = true;
-#ifndef THREADED_DNS
-                                               usr->dns_fd = -1;
-#endif
                                        }
                                        return true;
                                }
@@ -156,7 +153,10 @@ public:
                                if ((usr) && (usr->dns_done))
                                {
                                        if (resolver1.GetFD() != -1)
+                                       {
                                                dnslist[resolver1.GetFD()] = NULL;
+                                               user_fd_to_dns[usr->fd] = NULL;
+                                       }
                                        return true;
                                }
                                if (resolver1.GetFD() != -1)
@@ -165,22 +165,22 @@ public:
                                        hostname = resolver1.GetResult();
                                        if (usr)
                                        {
+                                               user_fd_to_dns[usr->fd] = NULL;
                                                if ((usr->registered > 3) || (hostname == ""))
                                                {
                                                        WriteServ(usr->fd,"NOTICE Auth :*** Could not resolve your hostname -- Using your IP address instead");
                                                        usr->dns_done = true;
                                                        return true;
                                                }
-                                       }
-                                       if ((hostname != "") && (usr))
-                                       {
-                                               resolver2.ForwardLookup(hostname, true);
-                                               if (resolver2.GetFD() != -1)
+                                               if (hostname != "")
                                                {
-                                                       dnslist[resolver2.GetFD()] = this;
-#ifndef THREADED_DNS
-                                                       usr->dns_fd = resolver2.GetFD();
-#endif
+                                                       resolver2.ForwardLookup(hostname, true);
+                                                       if (resolver2.GetFD() != -1)
+                                                       {
+                                                               dnslist[resolver2.GetFD()] = this;
+                                                               if (usr)
+                                                                       user_fd_to_dns[usr->fd] = this;
+                                                       }
                                                }
                                        }
                                }
@@ -238,6 +238,43 @@ bool lookup_dns(const std::string &nick)
        return false;
 }
 
+void ZapThisDns(int fd)
+{
+#ifdef THREADED_DNS
+/*     if (fd_ref_table[fd])
+       {
+                       if (fd_ref_table[fd]->registered >= 3)
+               {
+                       log(DEBUG,"Joining thread for user %d",fd);
+                       if (pthread_join(fd_ref_table[fd]->dnsthread, NULL))
+                       {
+                               log(DEBUG,"Can't pthread_join(): %s", strerror(errno));
+                       }
+               }
+       }*/
+#else
+       if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+               return;
+
+       Lookup *x = user_fd_to_dns[fd];
+
+       if (x)
+       {
+               if (x->resolver1.GetFD() > 0)
+               {
+                       log(DEBUG,"Whacked resolver1");
+                       dns_close(x->resolver1.GetFD());
+               }
+
+               if (x->resolver2.GetFD() > 0)
+               {
+                       log(DEBUG,"Whacked resolver2");
+                       dns_close(x->resolver2.GetFD());
+               }
+       }
+#endif
+}
+
 void dns_poll(int fdcheck)
 {
        /* Check the given file descriptor is in valid range */
@@ -283,4 +320,3 @@ void dns_poll(int fdcheck)
        if (ServerInstance && ServerInstance->SE)
                ServerInstance->SE->DelFd(fdcheck);
 }
-