Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netresolv: really enable IPV6.

Browse Source 
* Fixes setting of IPv6 address for localhost
* Maybe helps with #12156
This commit is contained in:
Adrien Destugues 2015-06-16 21:40:08 +02:00
parent f024ffe6b9
commit 032d5b4b59
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/kits/network/netresolv/Jamfile
View File

@ -26,7 +26,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
{
# we want to have the xxx_r functions, IPv6, and md5 implementation
# we also need to use our BSD compatibility functions
local defines = _REENTRANT=1 USE_MD5=1 _BSD_SOURCE IPV6 ;
local defines = _REENTRANT=1 USE_MD5=1 _BSD_SOURCE INET6 ;
defines = [ FDefines $(defines) ] ;
SubDirCcFlags $(defines) ;
SubDirC++Flags $(defines) ;

11
src/kits/network/netresolv/irs/getnameinfo.c
View File

@ -81,6 +81,7 @@ static const struct afd {
} afdl [] = {
#ifdef INET6
{PF_INET6, sizeof(struct in6_addr), sizeof(struct sockaddr_in6),
offsetof(struct sockaddr_in6, sin6_addr)},
#endif
{PF_INET, sizeof(struct in_addr), sizeof(struct sockaddr_in),
offsetof(struct sockaddr_in, sin_addr)},
@ -429,9 +430,9 @@ ip6_parsenumeric(const struct sockaddr *sa, const char *addr, char *host,
size_t numaddrlen;
char numaddr[512];
_DIAGASSERT(sa != NULL);
_DIAGASSERT(addr != NULL);
_DIAGASSERT(host != NULL);
assert(sa != NULL);
assert(addr != NULL);
assert(host != NULL);
if (inet_ntop(AF_INET6, addr, numaddr, (socklen_t)sizeof(numaddr))
== NULL)
@ -471,8 +472,8 @@ ip6_sa2str(const struct sockaddr_in6 *sa6, char *buf, size_t bufsiz, int flags)
const struct in6_addr *a6;
int n;
_DIAGASSERT(sa6 != NULL);
_DIAGASSERT(buf != NULL);
assert(sa6 != NULL);
assert(buf != NULL);
ifindex = (unsigned int)sa6->sin6_scope_id;
a6 = &sa6->sin6_addr;