[Midnightbsd-cvs] src [7530] trunk/sbin/route/route.c: remove kame kludge.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Thu Apr 14 08:13:16 EDT 2016
Revision: 7530
http://svnweb.midnightbsd.org/src/?rev=7530
Author: laffer1
Date: 2016-04-14 08:13:16 -0400 (Thu, 14 Apr 2016)
Log Message:
-----------
remove kame kludge.
Modified Paths:
--------------
trunk/sbin/route/route.c
Modified: trunk/sbin/route/route.c
===================================================================
--- trunk/sbin/route/route.c 2016-04-14 12:12:28 UTC (rev 7529)
+++ trunk/sbin/route/route.c 2016-04-14 12:13:16 UTC (rev 7530)
@@ -569,18 +569,6 @@
memcpy(&sin6, sa, sa->sa_len);
sin6.sin6_len = sizeof(struct sockaddr_in6);
sin6.sin6_family = AF_INET6;
-#ifdef __KAME__
- if (sa->sa_len == sizeof(struct sockaddr_in6) &&
- (IN6_IS_ADDR_LINKLOCAL(&sin6.sin6_addr) ||
- IN6_IS_ADDR_MC_LINKLOCAL(&sin6.sin6_addr) ||
- IN6_IS_ADDR_MC_NODELOCAL(&sin6.sin6_addr)) &&
- sin6.sin6_scope_id == 0) {
- sin6.sin6_scope_id =
- ntohs(*(u_int16_t *)&sin6.sin6_addr.s6_addr[2]);
- sin6.sin6_addr.s6_addr[2] = 0;
- sin6.sin6_addr.s6_addr[3] = 0;
- }
-#endif
if (nflag)
niflags |= NI_NUMERICHOST;
if (getnameinfo((struct sockaddr *)&sin6, sin6.sin6_len,
@@ -695,18 +683,6 @@
memcpy(&sin6, sa, sa->sa_len);
sin6.sin6_len = sizeof(struct sockaddr_in6);
sin6.sin6_family = AF_INET6;
-#ifdef __KAME__
- if (sa->sa_len == sizeof(struct sockaddr_in6) &&
- (IN6_IS_ADDR_LINKLOCAL(&sin6.sin6_addr) ||
- IN6_IS_ADDR_MC_LINKLOCAL(&sin6.sin6_addr) ||
- IN6_IS_ADDR_MC_NODELOCAL(&sin6.sin6_addr)) &&
- sin6.sin6_scope_id == 0) {
- sin6.sin6_scope_id =
- ntohs(*(u_int16_t *)&sin6.sin6_addr.s6_addr[2]);
- sin6.sin6_addr.s6_addr[2] = 0;
- sin6.sin6_addr.s6_addr[3] = 0;
- }
-#endif
if (nflag)
niflags |= NI_NUMERICHOST;
if (getnameinfo((struct sockaddr *)&sin6, sin6.sin6_len,
@@ -1279,16 +1255,6 @@
exit(1);
}
memcpy(&su->sin6, res->ai_addr, sizeof(su->sin6));
-#ifdef __KAME__
- if ((IN6_IS_ADDR_LINKLOCAL(&su->sin6.sin6_addr) ||
- IN6_IS_ADDR_MC_LINKLOCAL(&su->sin6.sin6_addr) ||
- IN6_IS_ADDR_MC_NODELOCAL(&su->sin6.sin6_addr)) &&
- su->sin6.sin6_scope_id) {
- *(u_int16_t *)&su->sin6.sin6_addr.s6_addr[2] =
- htons(su->sin6.sin6_scope_id);
- su->sin6.sin6_scope_id = 0;
- }
-#endif
freeaddrinfo(res);
if (q != NULL)
*q++ = '/';
More information about the Midnightbsd-cvs
mailing list