projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Releasing 1.0.8.
[tinc]
/
lib
/
fake-getaddrinfo.c
diff --git
a/lib/fake-getaddrinfo.c
b/lib/fake-getaddrinfo.c
index
0c9fae9
..
14420b5
100644
(file)
--- a/
lib/fake-getaddrinfo.c
+++ b/
lib/fake-getaddrinfo.c
@@
-14,6
+14,7
@@
#include "ipv4.h"
#include "ipv6.h"
#include "fake-getaddrinfo.h"
#include "ipv4.h"
#include "ipv6.h"
#include "fake-getaddrinfo.h"
+#include "xalloc.h"
#ifndef HAVE_GAI_STRERROR
char *gai_strerror(int ecode)
#ifndef HAVE_GAI_STRERROR
char *gai_strerror(int ecode)
@@
-23,6
+24,8
@@
char *gai_strerror(int ecode)
return "No address associated with hostname";
case EAI_MEMORY:
return "Memory allocation failure";
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";
}
default:
return "Unknown error";
}
@@
-67,6
+70,9
@@
int getaddrinfo(const char *hostname, const char *servname, const struct addrinf
int i;
uint16_t port = 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));
if (servname)
port = htons(atoi(servname));
@@
-82,7
+88,7
@@
int getaddrinfo(const char *hostname, const char *servname, const struct addrinf
hp = gethostbyname(hostname);
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++) {
return EAI_NODATA;
for (i = 0; hp->h_addr_list[i]; i++) {