X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fuser_resolver.cpp;h=db8d065f110da0285366aa6441ce6263c0779cd5;hb=18aae91d9336b204ac252ad83008bfd0e78595e4;hp=95fa13eaf65e015c8f3afc5d090f07f6547bff0d;hpb=5f4095e595fe36c6f83df96b7c59cb459b966ed3;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/src/user_resolver.cpp b/src/user_resolver.cpp
index 95fa13eaf..db8d065f1 100644
--- a/src/user_resolver.cpp
+++ b/src/user_resolver.cpp
@@ -14,8 +14,8 @@
 /* $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();
@@ -34,20 +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->ip.sa.sa_family == AF_INET6)
+				if (this->bound_user->client_sa.sa.sa_family == AF_INET6)
 				{
 					/* IPV6 forward lookup */
-					res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, DNS_QUERY_AAAA, lcached);
+					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)
@@ -59,9 +56,8 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
 	{
 		/* Both lookups completed */
 
-		irc::sockets::sockaddrs* 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.sa_family == AF_INET6)
 		{
 			struct in6_addr res_bin;
@@ -71,7 +67,6 @@ void UserResolver::OnLookupComplete(const std::string &result, unsigned int ttl,
 			}
 		}
 		else
-#endif
 		{
 			struct in_addr res_bin;
 			if (inet_pton(AF_INET, result.c_str(), &res_bin))