denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

host-resolver: don't try to resolve a plain v4 address to an IPv6 address

Browse Source 
Suppress 'Address family for hostname not supported' errors if a IPv6
client connects in a mixed IPv4/IPv6 environment.
This commit is contained in:
Volker Rümelin
2013-05-16 11:03:37 +02:00
committed by Martin Willi
parent 21bade294b
commit f8298b9f98
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/networking/host_resolver.c
+17 -3
View File
@@ -233,10 +233,24 @@ METHOD(host_resolver_t, resolve, host_t*,
.family = family, .family = family,
}; };
host_t *result; host_t *result;
struct in_addr addr;
if (family == AF_INET && strchr(name, ':')) switch (family)
{ /* do not try to convert v6 addresses for v4 family */ {
return NULL; case AF_INET:
/* do not try to convert v6 addresses for v4 family */
if (strchr(name, ':'))
{
return NULL;
}
break;
case AF_INET6:
/* do not try to convert v4 addresses for v6 family */
if (inet_pton(AF_INET, name, &addr) == 1)
{
return NULL;
}
break;
} }
this->mutex->lock(this->mutex); this->mutex->lock(this->mutex);
if (this->disabled) if (this->disabled)