/*
- * Functions for AF_ agnostic ipv4/ipv6 handling.
- *
* (c) 2008 Florian Westphal <fw@strlen.de>, public domain.
*/
#include "portab.h"
+/**
+ * @file
+ * Functions for AF_ agnostic ipv4/ipv6 handling.
+ */
+
#include <assert.h>
#include <stdio.h>
#include <string.h>
GLOBAL bool
ng_ipaddr_init(ng_ipaddr_t *addr, const char *ip_str, UINT16 port)
{
-#ifdef HAVE_GETADDRINFO
+#ifdef HAVE_WORKING_GETADDRINFO
int ret;
char portstr[64];
struct addrinfo *res0;
assert(ip_str);
memset(&hints, 0, sizeof(hints));
+#ifdef AI_NUMERICHOST
hints.ai_flags = AI_NUMERICHOST;
+#endif
+#ifndef WANT_IPV6 /* do not convert ipv6 addresses */
+ hints.ai_family = AF_INET;
+#endif
/* some getaddrinfo implementations require that ai_socktype is set. */
hints.ai_socktype = SOCK_STREAM;
snprintf(portstr, sizeof(portstr), "%u", (unsigned int) port);
ret = getaddrinfo(ip_str, portstr, &hints, &res0);
- assert(ret == 0);
if (ret != 0)
return false;
- assert(sizeof(*addr) >= res0->ai_addrlen);
- if (sizeof(*addr) >= res0->ai_addrlen)
+ assert(sizeof(*addr) >= (size_t)res0->ai_addrlen);
+ if (sizeof(*addr) >= (size_t)res0->ai_addrlen)
memcpy(addr, res0->ai_addr, res0->ai_addrlen);
else
ret = -1;