diff options
Diffstat (limited to 'sys/netinet6/route6.c')
| -rw-r--r-- | sys/netinet6/route6.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/sys/netinet6/route6.c b/sys/netinet6/route6.c index 045ed07eefb..ba04e656e64 100644 --- a/sys/netinet6/route6.c +++ b/sys/netinet6/route6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route6.c,v 1.8 2002/09/11 03:15:36 itojun Exp $ */ +/* $OpenBSD: route6.c,v 1.9 2003/05/14 14:24:44 itojun Exp $ */ /* $KAME: route6.c,v 1.22 2000/12/03 00:54:00 itojun Exp $ */ /* @@ -57,30 +57,16 @@ route6_input(mp, offp, proto) struct ip6_rthdr *rh; int off = *offp, rhlen; -#ifndef PULLDOWN_TEST - IP6_EXTHDR_CHECK(m, off, sizeof(*rh), IPPROTO_DONE); - ip6 = mtod(m, struct ip6_hdr *); - rh = (struct ip6_rthdr *)((caddr_t)ip6 + off); -#else ip6 = mtod(m, struct ip6_hdr *); IP6_EXTHDR_GET(rh, struct ip6_rthdr *, m, off, sizeof(*rh)); if (rh == NULL) { ip6stat.ip6s_tooshort++; return IPPROTO_DONE; } -#endif switch (rh->ip6r_type) { case IPV6_RTHDR_TYPE_0: rhlen = (rh->ip6r_len + 1) << 3; -#ifndef PULLDOWN_TEST - /* - * note on option length: - * due to IP6_EXTHDR_CHECK assumption, we cannot handle - * very big routing header (max rhlen == 2048). - */ - IP6_EXTHDR_CHECK(m, off, rhlen, IPPROTO_DONE); -#else /* * note on option length: * maximum rhlen: 2048 @@ -94,7 +80,6 @@ route6_input(mp, offp, proto) ip6stat.ip6s_tooshort++; return IPPROTO_DONE; } -#endif if (ip6_rthdr0(m, ip6, (struct ip6_rthdr0 *)rh)) return (IPPROTO_DONE); break; |