diff options
| author | ume <ume@FreeBSD.org> | 2003-10-10 16:04:00 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2003-10-10 16:04:00 +0000 |
| commit | a72f1bdb767fa08d3ce42494c037364f31421fb8 (patch) | |
| tree | 0a822f1e32a81df06aa7171ff2072981534b44ad /sys/netinet6/ip6_output.c | |
| parent | 8df937af7e7320438f99077b1d70e8f6a6c15068 (diff) | |
| download | FreeBSD-src-a72f1bdb767fa08d3ce42494c037364f31421fb8.zip FreeBSD-src-a72f1bdb767fa08d3ce42494c037364f31421fb8.tar.gz | |
nuke SCOPEDROUTING. Though it was there for a long time,
it was never enabled.
Diffstat (limited to 'sys/netinet6/ip6_output.c')
| -rw-r--r-- | sys/netinet6/ip6_output.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c index 0bb10d4..55eb3c3 100644 --- a/sys/netinet6/ip6_output.c +++ b/sys/netinet6/ip6_output.c @@ -530,11 +530,6 @@ skip_ipsec2:; dst->sin6_family = AF_INET6; dst->sin6_len = sizeof(struct sockaddr_in6); dst->sin6_addr = ip6->ip6_dst; -#ifdef SCOPEDROUTING - /* XXX: sin6_scope_id should already be fixed at this point */ - if (IN6_IS_SCOPE_LINKLOCAL(&dst->sin6_addr)) - dst->sin6_scope_id = ntohs(dst->sin6_addr.s6_addr16[1]); -#endif } #if defined(IPSEC) || defined(FAST_IPSEC) if (needipsec && needipsectun) { @@ -866,14 +861,12 @@ skip_ipsec2:; } else origifp = ifp; -#ifndef SCOPEDROUTING /* * clear embedded scope identifiers if necessary. * in6_clearscope will touch the addresses only when necessary. */ in6_clearscope(&ip6->ip6_src); in6_clearscope(&ip6->ip6_dst); -#endif /* * Check with the firewall... @@ -2534,14 +2527,12 @@ ip6_mloopback(ifp, m, dst) #endif ip6 = mtod(copym, struct ip6_hdr *); -#ifndef SCOPEDROUTING /* * clear embedded scope identifiers if necessary. * in6_clearscope will touch the addresses only when necessary. */ in6_clearscope(&ip6->ip6_src); in6_clearscope(&ip6->ip6_dst); -#endif (void)if_simloop(ifp, copym, dst->sin6_family, NULL); } |
