diff options
| author | ume <ume@FreeBSD.org> | 2005-05-13 16:31:11 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2005-05-13 16:31:11 +0000 |
| commit | e33ba033454acbec171e04edba1395842e412b5c (patch) | |
| tree | 9ae1266a1a3de18e5409202ab088ec8928d3410e /sbin | |
| parent | 4c5083a81ce14f96f4193b746c54f7e17d94e21b (diff) | |
| download | FreeBSD-src-e33ba033454acbec171e04edba1395842e412b5c.zip FreeBSD-src-e33ba033454acbec171e04edba1395842e412b5c.tar.gz | |
NI_WITHSCOPEID cleanup. Neither RFC 2553 nor RFC 3493 defines
NI_WITHSCOPEID, and our getaddrinfo(3) does nothing special
for it, now.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/ifconfig/af_inet6.c | 21 | ||||
| -rw-r--r-- | sbin/route/route.c | 6 |
2 files changed, 6 insertions, 21 deletions
diff --git a/sbin/ifconfig/af_inet6.c b/sbin/ifconfig/af_inet6.c index 77ad5fc..6112f2b 100644 --- a/sbin/ifconfig/af_inet6.c +++ b/sbin/ifconfig/af_inet6.c @@ -57,11 +57,6 @@ static const char rcsid[] = #include "ifconfig.h" -/* wrapper for KAME-special getnameinfo() */ -#ifndef NI_WITHSCOPEID -#define NI_WITHSCOPEID 0 -#endif - static struct in6_ifreq in6_ridreq; static struct in6_aliasreq in6_addreq = { { 0 }, @@ -236,8 +231,7 @@ in6_status(int s __unused, const struct rt_addrinfo * info) scopeid = sin->sin6_scope_id; error = getnameinfo((struct sockaddr *)sin, sin->sin6_len, addr_buf, - sizeof(addr_buf), NULL, 0, - NI_NUMERICHOST|NI_WITHSCOPEID); + sizeof(addr_buf), NULL, 0, NI_NUMERICHOST); if (error != 0) inet_ntop(AF_INET6, &sin->sin6_addr, addr_buf, sizeof(addr_buf)); @@ -267,7 +261,7 @@ in6_status(int s __unused, const struct rt_addrinfo * info) error = getnameinfo((struct sockaddr *)sin, sin->sin6_len, addr_buf, sizeof(addr_buf), NULL, 0, - NI_NUMERICHOST|NI_WITHSCOPEID); + NI_NUMERICHOST); if (error != 0) inet_ntop(AF_INET6, &sin->sin6_addr, addr_buf, sizeof(addr_buf)); @@ -454,11 +448,6 @@ in6_status_tunnel(int s) { char src[NI_MAXHOST]; char dst[NI_MAXHOST]; -#ifdef NI_WITHSCOPEID - const int niflag = NI_NUMERICHOST | NI_WITHSCOPEID; -#else - const int niflag = NI_NUMERICHOST; -#endif struct in6_ifreq in6_ifr; const struct sockaddr *sa = (const struct sockaddr *) &in6_ifr.ifr_addr; @@ -469,14 +458,16 @@ in6_status_tunnel(int s) return; if (sa->sa_family == AF_INET6) in6_fillscopeid(&in6_ifr.ifr_addr); - if (getnameinfo(sa, sa->sa_len, src, sizeof(src), 0, 0, niflag) != 0) + if (getnameinfo(sa, sa->sa_len, src, sizeof(src), 0, 0, + NI_NUMERICHOST) != 0) src[0] = '\0'; if (ioctl(s, SIOCGIFPDSTADDR_IN6, (caddr_t)&in6_ifr) < 0) return; if (sa->sa_family == AF_INET6) in6_fillscopeid(&in6_ifr.ifr_addr); - if (getnameinfo(sa, sa->sa_len, dst, sizeof(dst), 0, 0, niflag) != 0) + if (getnameinfo(sa, sa->sa_len, dst, sizeof(dst), 0, 0, + NI_NUMERICHOST) != 0) dst[0] = '\0'; printf("\ttunnel inet6 %s --> %s\n", src, dst); diff --git a/sbin/route/route.c b/sbin/route/route.c index bc5c202..0ae44e6 100644 --- a/sbin/route/route.c +++ b/sbin/route/route.c @@ -352,9 +352,6 @@ routename(sa) { struct sockaddr_in6 sin6; /* use static var for safety */ int niflags = 0; -#ifdef NI_WITHSCOPEID - niflags = NI_WITHSCOPEID; -#endif memset(&sin6, 0, sizeof(sin6)); memcpy(&sin6, sa, sa->sa_len); @@ -480,9 +477,6 @@ netname(sa) { struct sockaddr_in6 sin6; /* use static var for safety */ int niflags = 0; -#ifdef NI_WITHSCOPEID - niflags = NI_WITHSCOPEID; -#endif memset(&sin6, 0, sizeof(sin6)); memcpy(&sin6, sa, sa->sa_len); |
