Remove InspIRCd* parameters and fields

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

diff --git a/src/user_resolver.cpp b/src/user_resolver.cpp
index 8e65ea656ab9d278745d8caecf83d837e4839183..db8d065f110da0285366aa6441ce6263c0779cd5 100644 (file)
--- a/src/user_resolver.cpp
+++ b/src/user_resolver.cpp
@@ -14,19 +14,15 @@
 /* $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(User* user, std::string to_resolve, QueryType qt, bool &cache) :
+       Resolver(to_resolve, qt, cache), 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))
@@ -38,21 +34,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)
@@ -63,9 +55,27 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
        else if ((this->fwd) && (ServerInstance->SE->GetRef(this->bound_fd) == this->bound_user))
        {
                /* 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)