projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for SOCKS 5 proxies.
[tinc]
/
lib
/
fake-getaddrinfo.c
diff --git
a/lib/fake-getaddrinfo.c
b/lib/fake-getaddrinfo.c
index
0c9fae9
..
10672b7
100644
(file)
--- a/
lib/fake-getaddrinfo.c
+++ b/
lib/fake-getaddrinfo.c
@@
-14,8
+14,9
@@
#include "ipv4.h"
#include "ipv6.h"
#include "fake-getaddrinfo.h"
#include "ipv4.h"
#include "ipv6.h"
#include "fake-getaddrinfo.h"
+#include "xalloc.h"
-#if
ndef HAVE
_GAI_STRERROR
+#if
!HAVE_DECL
_GAI_STRERROR
char *gai_strerror(int ecode)
{
switch (ecode) {
char *gai_strerror(int ecode)
{
switch (ecode) {
@@
-23,13
+24,15
@@
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";
}
}
#endif /* !HAVE_GAI_STRERROR */
default:
return "Unknown error";
}
}
#endif /* !HAVE_GAI_STRERROR */
-#if
ndef HAVE
_FREEADDRINFO
+#if
!HAVE_DECL
_FREEADDRINFO
void freeaddrinfo(struct addrinfo *ai)
{
struct addrinfo *next;
void freeaddrinfo(struct addrinfo *ai)
{
struct addrinfo *next;
@@
-42,7
+45,7
@@
void freeaddrinfo(struct addrinfo *ai)
}
#endif /* !HAVE_FREEADDRINFO */
}
#endif /* !HAVE_FREEADDRINFO */
-#if
ndef HAVE
_GETADDRINFO
+#if
!HAVE_DECL
_GETADDRINFO
static struct addrinfo *malloc_ai(uint16_t port, uint32_t addr)
{
struct addrinfo *ai;
static struct addrinfo *malloc_ai(uint16_t port, uint32_t addr)
{
struct addrinfo *ai;
@@
-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++) {