system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-17 05:43:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-enable ip6addrctl support but only for IPv6 address.

Browse source 
Requested by:	Ben Morrow <ben__at__morrow.me.uk>
MFC after:	1 week
This commit is contained in:
Hajimu UMEMOTO 2013-01-10 14:08:19 +00:00
parent 3ac7d29722
commit f09c52c333
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=245256
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/libc/net/name6.c
View file

@ -200,7 +200,7 @@ static struct hostent *_hpmapv6(struct hostent *, int *);
#endif #endif
static struct hostent *_hpsort(struct hostent *, res_state); static struct hostent *_hpsort(struct hostent *, res_state);
#ifdef ENABLE_IP6ADDRCTL #ifdef INET6
static struct hostent *_hpreorder(struct hostent *); static struct hostent *_hpreorder(struct hostent *);
static int get_addrselectpolicy(struct policyhead *); static int get_addrselectpolicy(struct policyhead *);
static void free_addrselectpolicy(struct policyhead *); static void free_addrselectpolicy(struct policyhead *);
@ -287,8 +287,10 @@ getipnodebyname(const char *name, int af, int flags, int *errp)
hp = gethostbyname2(name, af); hp = gethostbyname2(name, af);
hp = _hpcopy(hp, errp); hp = _hpcopy(hp, errp);
#ifdef INET6 #ifdef INET6
if (af == AF_INET6)
hp = _hpreorder(hp);
if (af == AF_INET6 && ((flags & AI_ALL) || hp == NULL) && if (af == AF_INET6 && ((flags & AI_ALL) || hp == NULL) &&
MAPADDRENABLED(flags)) { MAPADDRENABLED(flags)) {
struct hostent *hp2 = gethostbyname2(name, AF_INET); struct hostent *hp2 = gethostbyname2(name, AF_INET);
@ -311,11 +313,7 @@ getipnodebyname(const char *name, int af, int flags, int *errp)
*errp = statp->res_h_errno; *errp = statp->res_h_errno;
statp->options = options; statp->options = options;
#ifdef ENABLE_IP6ADDRCTL
return _hpreorder(_hpsort(hp, statp));
#else
return _hpsort(hp, statp); return _hpsort(hp, statp);
#endif
} }
struct hostent * struct hostent *
@ -638,7 +636,7 @@ _hpsort(struct hostent *hp, res_state statp)
return hp; return hp;
} }
#ifdef ENABLE_IP6ADDRCTL #ifdef INET6
/* /*
* _hpreorder: sort address by default address selection * _hpreorder: sort address by default address selection
*/ */