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 0213a3cbf7743d04658d0ecebb455fffe5ff8709..5180d670aa81c5caaec58cfb4d573e3e085ee91d 100644 (file)
--- a/src/user_resolver.cpp
+++ b/src/user_resolver.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,11 +11,9 @@
  * ---------------------------------------------------
  */
 
-/* $Core */
-
 #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();
@@ -25,7 +23,7 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
 {
        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
@@ -34,21 +32,17 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
                        if (this->bound_user->registered != REG_ALL)
                        {
                                bool lcached = false;
-#ifdef IPV6
-                               if (this->bound_user->GetProtocolFamily() == AF_INET6)
+                               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();
-                                       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) */
-                                       res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, DNS_QUERY_A, lcached);
+                                       /* IPV4 lookup */
+                                       res_forward = new UserResolver(bound_user, result, DNS_QUERY_A, lcached);
                                }
-                               this->ServerInstance->AddResolver(res_forward, lcached);
+                               ServerInstance->AddResolver(res_forward, lcached);
                        }
                }
                catch (CoreException& e)
@@ -56,30 +50,26 @@ 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 */
 
-               sockaddr* user_ip = this->bound_user->ip;
+               irc::sockets::sockaddrs* user_ip = &this->bound_user->client_sa;
                bool rev_match = false;
-#ifdef IPV6
-               if (user_ip->sa_family == AF_INET6)
+               if (user_ip->sa.sa_family == AF_INET6)
                {
                        struct in6_addr res_bin;
                        if (inet_pton(AF_INET6, result.c_str(), &res_bin))
                        {
-                               sockaddr_in6* user_ip6 = reinterpret_cast<sockaddr_in6*>(user_ip);
-                               rev_match = !memcmp(&user_ip6->sin6_addr, &res_bin, sizeof(res_bin));
+                               rev_match = !memcmp(&user_ip->in6.sin6_addr, &res_bin, sizeof(res_bin));
                        }
                }
                else
-#endif
                {
                        struct in_addr res_bin;
                        if (inet_pton(AF_INET, result.c_str(), &res_bin))
                        {
-                               sockaddr_in* user_ip4 = reinterpret_cast<sockaddr_in*>(user_ip);
-                               rev_match = !memcmp(&user_ip4->sin_addr, &res_bin, sizeof(res_bin));
+                               rev_match = !memcmp(&user_ip->in4.sin_addr, &res_bin, sizeof(res_bin));
                        }
                }
                
@@ -128,7 +118,7 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
 
 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;