Merge branch 'master' into 1.1

[meshlink] / lib / fake-getaddrinfo.c

diff --git a/lib/fake-getaddrinfo.c b/lib/fake-getaddrinfo.c
index 0c9fae94dda83b5d18f67256cf9b1c372b29a87f..df3d34764dc9680dd1d625cd10ed94e2bdfb19d0 100644 (file)
--- a/lib/fake-getaddrinfo.c
+++ b/lib/fake-getaddrinfo.c
@@ -14,24 +14,26 @@
 #include "ipv4.h"
 #include "ipv6.h"
 #include "fake-getaddrinfo.h"
+#include "xalloc.h"
 
-#ifndef HAVE_GAI_STRERROR
-char *gai_strerror(int ecode)
-{
+
+#if !HAVE_DECL_GAI_STRERROR
+char *gai_strerror(int ecode) {
        switch (ecode) {
                case EAI_NODATA:
                        return "No address associated with hostname";
                case EAI_MEMORY:
                        return "Memory allocation failure";
+               case EAI_FAMILY:
+                       return "Address family not supported";
                default:
                        return "Unknown error";
        }
 }    
 #endif /* !HAVE_GAI_STRERROR */
 
-#ifndef HAVE_FREEADDRINFO
-void freeaddrinfo(struct addrinfo *ai)
-{
+#if !HAVE_DECL_FREEADDRINFO
+void freeaddrinfo(struct addrinfo *ai) {
        struct addrinfo *next;
 
        while(ai) {
@@ -42,9 +44,8 @@ void freeaddrinfo(struct addrinfo *ai)
 }
 #endif /* !HAVE_FREEADDRINFO */
 
-#ifndef HAVE_GETADDRINFO
-static struct addrinfo *malloc_ai(uint16_t port, uint32_t addr)
-{
+#if !HAVE_DECL_GETADDRINFO
+static struct addrinfo *malloc_ai(uint16_t port, uint32_t addr) {
        struct addrinfo *ai;
 
        ai = xmalloc_and_zero(sizeof(struct addrinfo) + sizeof(struct sockaddr_in));
@@ -59,14 +60,16 @@ static struct addrinfo *malloc_ai(uint16_t port, uint32_t addr)
        return ai;
 }
 
-int getaddrinfo(const char *hostname, const char *servname, const struct addrinfo *hints, struct addrinfo **res)
-{
+int getaddrinfo(const char *hostname, const char *servname, const struct addrinfo *hints, struct addrinfo **res) {
        struct addrinfo *prev = NULL;
        struct hostent *hp;
        struct in_addr in = {0};
        int i;
        uint16_t port = 0;
 
+       if(hints && hints->ai_family != AF_INET && hints->ai_family != AF_UNSPEC)
+               return EAI_FAMILY;
+
        if (servname)
                port = htons(atoi(servname));
 
@@ -82,7 +85,7 @@ int getaddrinfo(const char *hostname, const char *servname, const struct addrinf
        
        hp = gethostbyname(hostname);
 
-       if(!hp || !hp->h_addr_list[0])
+       if(!hp || !hp->h_addr_list || !hp->h_addr_list[0])
                return EAI_NODATA;
 
        for (i = 0; hp->h_addr_list[i]; i++) {