projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported gnutls based branch.
[tinc]
/
lib
/
fake-getaddrinfo.c
diff --git
a/lib/fake-getaddrinfo.c
b/lib/fake-getaddrinfo.c
index
0c9fae9
..
734f50a
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";
}
@@
-61,12
+64,15
@@
static struct addrinfo *malloc_ai(uint16_t port, uint32_t addr)
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 addrinfo *
ai, *
prev = NULL;
struct hostent *hp;
struct in_addr in = {0};
int i;
uint16_t port = 0;
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));
if (servname)
port = htons(atoi(servname));
@@
-82,16
+88,18
@@
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++) {
- *
res
= malloc_ai(port, ((struct in_addr *)hp->h_addr_list[i])->s_addr);
+ *
ai
= malloc_ai(port, ((struct in_addr *)hp->h_addr_list[i])->s_addr);
if(prev)
prev->ai_next = *res;
if(prev)
prev->ai_next = *res;
+ else
+ *res = ai;
- prev =
*res
;
+ prev =
ai
;
}
return 0;
}
return 0;