typedef struct {
SilcNetResolveCallback completion;
void *context;
+ bool prefer_ipv6;
SilcSchedule schedule;
char *input;
char *result;
SilcNetResolveContext r = (SilcNetResolveContext)context;
char tmp[64];
- if (silc_net_gethostbyname(r->input, tmp, sizeof(tmp)))
+ if (silc_net_gethostbyname(r->input, r->prefer_ipv6, tmp, sizeof(tmp)))
r->result = strdup(tmp);
silc_schedule_task_add(r->schedule, 0, silc_net_resolve_completion, r, 0, 1,
/* Resolves IP address for hostname. */
-bool silc_net_gethostbyname(const char *name, char *address,
- uint32 address_len)
+bool silc_net_gethostbyname(const char *name, bool prefer_ipv6, char *address,
+ SilcUInt32 address_len)
{
#ifdef HAVE_IPV6
- struct addrinfo hints, *ai;
+ struct addrinfo hints, *ai, *tmp, *ip4 = NULL, *ip6 = NULL;
memset(&hints, 0, sizeof(hints));
hints.ai_socktype = SOCK_STREAM;
if (getaddrinfo(name, NULL, &hints, &ai))
return FALSE;
- if (getnameinfo(ai->ai_addr, ai->ai_addrlen, address,
- address_len, NULL, 0, NI_NUMERICHOST)) {
+ for (tmp = ai; tmp; tmp = tmp->ai_next) {
+ if (tmp->ai_family == AF_INET6) {
+ ip6 = tmp;
+ if (ip4)
+ break;
+ continue;
+ }
+ if (tmp->ai_family == AF_INET) {
+ ip4 = tmp;
+ if (ip6)
+ break;
+ continue;
+ }
+ }
+
+ tmp = (prefer_ipv6 ? (ip6 ? ip6 : ip4) : (ip4 ? ip4 : ip6));
+ if (!tmp) {
freeaddrinfo(ai);
return FALSE;
- } else {
+ }
+
+ if (getnameinfo(tmp->ai_addr, tmp->ai_addrlen, address,
+ address_len, NULL, 0, NI_NUMERICHOST)) {
freeaddrinfo(ai);
+ return FALSE;
}
+
+ freeaddrinfo(ai);
#else
struct hostent *hp;
struct in_addr ip;
/* Resolves IP address for hostname async. */
void silc_net_gethostbyname_async(const char *name,
+ bool prefer_ipv6,
SilcSchedule schedule,
SilcNetResolveCallback completion,
void *context)
r->completion = completion;
r->context = context;
+ r->prefer_ipv6 = prefer_ipv6;
r->schedule = schedule;
r->input = strdup(name);
/* Resolves hostname by IP address. */
-bool silc_net_gethostbyaddr(const char *addr, char *name, uint32 name_len)
+bool silc_net_gethostbyaddr(const char *addr, char *name, SilcUInt32 name_len)
{
#ifdef HAVE_IPV6
struct addrinfo req, *ai;
/* Return remote port by socket. */
-uint16 silc_net_get_remote_port(int sock)
+SilcUInt16 silc_net_get_remote_port(int sock)
{
#ifdef HAVE_IPV6
struct sockaddr_storage remote;
/* Return local port by socket. */
-uint16 silc_net_get_local_port(int sock)
+SilcUInt16 silc_net_get_local_port(int sock)
{
#ifdef HAVE_IPV6
struct sockaddr_storage local;
if (gethostname(hostname, sizeof(hostname)))
return NULL;
- if (!silc_net_gethostbyname(hostname, ip_addr, sizeof(ip_addr)))
+ if (!silc_net_gethostbyname(hostname, TRUE, ip_addr, sizeof(ip_addr)))
return strdup(hostname);
silc_net_gethostbyaddr(ip_addr, hostname, sizeof(hostname));
if (gethostname(hostname, sizeof(hostname)))
return NULL;
- if (!silc_net_gethostbyname(hostname, ip_addr, sizeof(ip_addr)))
+ if (!silc_net_gethostbyname(hostname, TRUE, ip_addr, sizeof(ip_addr)))
return NULL;
return strdup(ip_addr);