/* $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();
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)
{
/* 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;
}
}
else
-#endif
{
struct in_addr res_bin;
if (inet_pton(AF_INET, result.c_str(), &res_bin))