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(this->ServerInstance, this->bound_user, result, DNS_QUERY_AAAA, lcached);
}
else
- /* IPV4 lookup (mixed protocol mode) */
-#endif
{
- /* IPV4 lookup (ipv4 only mode) */
+ /* IPV4 lookup */
res_forward = new UserResolver(this->ServerInstance, this->bound_user, result, DNS_QUERY_A, lcached);
}
this->ServerInstance->AddResolver(res_forward, lcached);
{
/* 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));
}
}