/*
- * 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>
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;
return ret == 0;
#else /* HAVE_GETADDRINFO */
assert(ip_str);
+ memset(addr, 0, sizeof *addr);
+#ifdef HAVE_sockaddr_in_len
+ addr->sin4.sin_len = sizeof(addr->sin4);
+#endif
addr->sin4.sin_family = AF_INET;
# ifdef HAVE_INET_ATON
if (inet_aton(ip_str, &addr->sin4.sin_addr) == 0)