rename channel modes +it to distinguish them from commands

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

diff --git a/src/user_resolver.cpp b/src/user_resolver.cpp
index 3f010df036828bdd4245920cb5daa31b76f5f6ab..5180d670aa81c5caaec58cfb4d573e3e085ee91d 100644 (file)
--- a/src/user_resolver.cpp
+++ b/src/user_resolver.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -11,24 +11,19 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDuserresolver */
-
 #include "inspircd.h"
-
-UserResolver::UserResolver(InspIRCd* Instance, User* user, std::string to_resolve, QueryType qt, bool &cache) :
-       Resolver(Instance, to_resolve, qt, cache), bound_user(user)
+UserResolver::UserResolver(LocalUser* user, std::string to_resolve, QueryType qt, bool &cache) :
+       Resolver(to_resolve, qt, cache, NULL), bound_user(user)
 {
        this->fwd = (qt == DNS_QUERY_A || qt == DNS_QUERY_AAAA);
        this->bound_fd = user->GetFd();
 }
 
-void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl, bool cached, int resultnum)
+void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl, bool cached)
 {
-       /* We are only interested in the first matching result */
-       if (resultnum)
-               return;
+       UserResolver *res_forward; // for forward-resolution
 
-       if ((!this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user))
+       if ((!this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == &bound_user->eh))
        {
                this->bound_user->stored_host = result;
                try
@@ -36,20 +31,18 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
                        /* Check we didnt time out */
                        if (this->bound_user->registered != REG_ALL)
                        {
-                               bool lcached;
-#ifdef IPV6
-                               if (this->bound_user->GetProtocolFamily() == AF_INET6)
+                               bool lcached = false;
+                               if (this->bound_user->client_sa.sa.sa_family == AF_INET6)
                                {
-                                       /* IPV6 forward lookup (with possibility of 4in6) */
-                                       const char* ip = this->bound_user->GetIPString();
-                                       bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, (!strncmp(ip, "0::ffff:", 8) ? DNS_QUERY_A : DNS_QUERY_AAAA), lcached);
+                                       /* IPV6 forward lookup */
+                                       res_forward = new UserResolver(bound_user, result, DNS_QUERY_AAAA, lcached);
                                }
                                else
-                                       /* IPV4 lookup (mixed protocol mode) */
-#endif
-                               /* IPV4 lookup (ipv4 only mode) */
-                               bound_user->res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, DNS_QUERY_A, lcached);
-                               this->ServerInstance->AddResolver(bound_user->res_forward, lcached);
+                               {
+                                       /* IPV4 lookup */
+                                       res_forward = new UserResolver(bound_user, result, DNS_QUERY_A, lcached);
+                               }
+                               ServerInstance->AddResolver(res_forward, lcached);
                        }
                }
                catch (CoreException& e)
@@ -57,12 +50,30 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
                        ServerInstance->Logs->Log("RESOLVER", DEBUG,"Error in resolver: %s",e.GetReason());
                }
        }
-       else if ((this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user))
+       else if ((this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == &bound_user->eh))
        {
                /* Both lookups completed */
-               std::string result2("0::ffff:");
-               result2.append(result);
-               if (this->bound_user->GetIPString() == result || this->bound_user->GetIPString() == result2)
+
+               irc::sockets::sockaddrs* user_ip = &this->bound_user->client_sa;
+               bool rev_match = false;
+               if (user_ip->sa.sa_family == AF_INET6)
+               {
+                       struct in6_addr res_bin;
+                       if (inet_pton(AF_INET6, result.c_str(), &res_bin))
+                       {
+                               rev_match = !memcmp(&user_ip->in6.sin6_addr, &res_bin, sizeof(res_bin));
+                       }
+               }
+               else
+               {
+                       struct in_addr res_bin;
+                       if (inet_pton(AF_INET, result.c_str(), &res_bin))
+                       {
+                               rev_match = !memcmp(&user_ip->in4.sin_addr, &res_bin, sizeof(res_bin));
+                       }
+               }
+               
+               if (rev_match)
                {
                        std::string hostname = this->bound_user->stored_host;
                        if (hostname.length() < 65)
@@ -71,13 +82,13 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
                                if ((this->bound_user->registered != REG_ALL) && (!this->bound_user->dns_done))
                                {
                                        /* Hostnames starting with : are not a good thing (tm) */
-                                       if (*(hostname.c_str()) == ':')
+                                       if (hostname[0] == ':')
                                                hostname.insert(0, "0");
 
                                        this->bound_user->WriteServ("NOTICE Auth :*** Found your hostname (%s)%s", hostname.c_str(), (cached ? " -- cached" : ""));
                                        this->bound_user->dns_done = true;
-                                       strlcpy(this->bound_user->dhost, hostname.c_str(),64);
-                                       strlcpy(this->bound_user->host, hostname.c_str(),64);
+                                       this->bound_user->dhost.assign(hostname, 0, 64);
+                                       this->bound_user->host.assign(hostname, 0, 64);
                                        /* Invalidate cache */
                                        this->bound_user->InvalidateCache();
                                }
@@ -99,17 +110,19 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
                                this->bound_user->dns_done = true;
                        }
                }
+
+               // Save some memory by freeing this up; it's never used again in the user's lifetime.
+               this->bound_user->stored_host.resize(0);
        }
 }
 
 void UserResolver::OnError(ResolverError e, const std::string &errormessage)
 {
-       if (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user)
+       if (ServerInstance->SE->GetRef(this->bound_fd) == &bound_user->eh)
        {
                this->bound_user->WriteServ("NOTICE Auth :*** Could not resolve your hostname: %s; using your IP address (%s) instead.", errormessage.c_str(), this->bound_user->GetIPString());
                this->bound_user->dns_done = true;
+               this->bound_user->stored_host.resize(0);
                ServerInstance->stats->statsDnsBad++;
        }
 }
-
-