diff options
| -rw-r--r-- | sys/netinet6/icmp6.c | 6 | ||||
| -rw-r--r-- | sys/netinet6/in6.c | 10 | ||||
| -rw-r--r-- | sys/netinet6/in6_ifattach.c | 6 | ||||
| -rw-r--r-- | sys/netinet6/nd6_rtr.c | 6 |
4 files changed, 4 insertions, 24 deletions
diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c index 6aa117eff9a..ea813cebdb7 100644 --- a/sys/netinet6/icmp6.c +++ b/sys/netinet6/icmp6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: icmp6.c,v 1.87 2006/06/16 16:49:40 henning Exp $ */ +/* $OpenBSD: icmp6.c,v 1.88 2006/11/15 03:07:44 itojun Exp $ */ /* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */ /* @@ -1027,7 +1027,6 @@ icmp6_notify_error(m, off, icmp6len, code) icmp6dst.sin6_addr = *finaldst; icmp6dst.sin6_scope_id = in6_addr2scopeid(m->m_pkthdr.rcvif, &icmp6dst.sin6_addr); -#ifndef SCOPEDROUTING if (in6_embedscope(&icmp6dst.sin6_addr, &icmp6dst, NULL, NULL)) { /* should be impossbile */ @@ -1035,7 +1034,6 @@ icmp6_notify_error(m, off, icmp6len, code) "icmp6_notify_error: in6_embedscope failed\n")); goto freeit; } -#endif /* * retrieve parameters from the inner IPv6 header, and convert @@ -1047,7 +1045,6 @@ icmp6_notify_error(m, off, icmp6len, code) icmp6src.sin6_addr = eip6->ip6_src; icmp6src.sin6_scope_id = in6_addr2scopeid(m->m_pkthdr.rcvif, &icmp6src.sin6_addr); -#ifndef SCOPEDROUTING if (in6_embedscope(&icmp6src.sin6_addr, &icmp6src, NULL, NULL)) { /* should be impossbile */ @@ -1055,7 +1052,6 @@ icmp6_notify_error(m, off, icmp6len, code) "icmp6_notify_error: in6_embedscope failed\n")); goto freeit; } -#endif icmp6src.sin6_flowinfo = (eip6->ip6_flow & IPV6_FLOWLABEL_MASK); diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index d5b24f5dae1..0b810a17153 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6.c,v 1.70 2006/11/14 04:44:22 itojun Exp $ */ +/* $OpenBSD: in6.c,v 1.71 2006/11/15 03:07:44 itojun Exp $ */ /* $KAME: in6.c,v 1.372 2004/06/14 08:14:21 itojun Exp $ */ /* @@ -1037,9 +1037,7 @@ in6_update_ifa(ifp, ifra, ia) /* join necessary multiast groups */ if ((ifp->if_flags & IFF_MULTICAST) != 0) { struct sockaddr_in6 mltaddr, mltmask; -#ifndef SCOPEDROUTING u_int32_t zoneid = 0; -#endif /* join solicited multicast addr for new host id */ struct sockaddr_in6 llsol; @@ -1088,7 +1086,6 @@ in6_update_ifa(ifp, ifra, ia) if (rt) { /* * 32bit came from "mltmask" - * XXX: only works in !SCOPEDROUTING case. */ if (memcmp(&mltaddr.sin6_addr, &((struct sockaddr_in6 *)rt_key(rt))->sin6_addr, @@ -1116,9 +1113,7 @@ in6_update_ifa(ifp, ifra, ia) } else { RTFREE(rt); } -#ifndef SCOPEDROUTING mltaddr.sin6_scope_id = zoneid; /* XXX */ -#endif imm = in6_joingroup(ifp, &mltaddr.sin6_addr, &error); if (!imm) { nd6log((LOG_WARNING, @@ -2121,9 +2116,6 @@ in6_is_addr_deprecated(sa6) for (ia = in6_ifaddr; ia; ia = ia->ia_next) { if (IN6_ARE_ADDR_EQUAL(&ia->ia_addr.sin6_addr, &sa6->sin6_addr) && -#ifdef SCOPEDROUTING - ia->ia_addr.sin6_scope_id == sa6->sin6_scope_id && -#endif (ia->ia6_flags & IN6_IFF_DEPRECATED) != 0) return (1); /* true */ diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index d26b3997805..03e8f264835 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in6_ifattach.c,v 1.43 2006/08/31 12:37:31 mcbride Exp $ */ +/* $OpenBSD: in6_ifattach.c,v 1.44 2006/11/15 03:07:44 itojun Exp $ */ /* $KAME: in6_ifattach.c,v 1.124 2001/07/18 08:32:51 jinmei Exp $ */ /* @@ -355,10 +355,6 @@ in6_ifattach_linklocal(ifp, altifp) ifra.ifra_prefixmask.sin6_len = sizeof(struct sockaddr_in6); ifra.ifra_prefixmask.sin6_family = AF_INET6; ifra.ifra_prefixmask.sin6_addr = in6mask64; -#ifdef SCOPEDROUTING - /* take into account the sin6_scope_id field for routing */ - ifra.ifra_prefixmask.sin6_scope_id = 0xffffffff; -#endif /* link-local addresses should NEVER expire. */ ifra.ifra_lifetime.ia6t_vltime = ND6_INFINITE_LIFETIME; ifra.ifra_lifetime.ia6t_pltime = ND6_INFINITE_LIFETIME; diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 5dd82b89a87..ad3b6954885 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nd6_rtr.c,v 1.40 2006/06/16 16:49:40 henning Exp $ */ +/* $OpenBSD: nd6_rtr.c,v 1.41 2006/11/15 03:07:44 itojun Exp $ */ /* $KAME: nd6_rtr.c,v 1.97 2001/02/07 11:09:13 itojun Exp $ */ /* @@ -451,9 +451,7 @@ defrouter_addreq(new) sizeof(struct sockaddr_in6); def.sin6_family = mask.sin6_family = gate.sin6_family = AF_INET6; gate.sin6_addr = new->rtaddr; -#ifndef SCOPEDROUTING gate.sin6_scope_id = 0; /* XXX */ -#endif s = splsoftnet(); error = rtrequest(RTM_ADD, (struct sockaddr *)&def, @@ -552,9 +550,7 @@ defrouter_delreq(dr) sizeof(struct sockaddr_in6); def.sin6_family = mask.sin6_family = gw.sin6_family = AF_INET6; gw.sin6_addr = dr->rtaddr; -#ifndef SCOPEDROUTING gw.sin6_scope_id = 0; /* XXX */ -#endif rtrequest(RTM_DELETE, (struct sockaddr *)&def, (struct sockaddr *)&gw, |