diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2008-11-02 10:37:30 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2008-11-02 10:37:30 +0000 |
| commit | ed999272ebd7f53d0236922c4a3fc81d433b3c4f (patch) | |
| tree | aed3227f4980a68976499de5461753133f898b2b /sys/netinet | |
| parent | addb1314ab5e1e8134b2b98e77386470ce812098 (diff) | |
Remove the M_ANYCAST6 mbuf flag by doing the detection all in ip6_input().
M_ANYCAST6 was only used to signal tcp6_input() that it should drop the
packet and send back icmp error. This can be done in ip6_input() without
the need for a mbuf flag. Gives us back one slot in m_flags for possible
future need. Looked at and some input by naddy@ and henning@. OK dlg@
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/tcp_input.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index aeeb13f569f..cd63922fe2b 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_input.c,v 1.223 2008/10/10 20:03:42 dhill Exp $ */ +/* $OpenBSD: tcp_input.c,v 1.224 2008/11/02 10:37:29 claudio Exp $ */ /* $NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $ */ /* @@ -342,21 +342,6 @@ tcp6_input(struct mbuf **mp, int *offp, int proto) } #endif - /* - * draft-itojun-ipv6-tcp-to-anycast - * better place to put this in? - */ - if (m->m_flags & M_ANYCAST6) { - if (m->m_len >= sizeof(struct ip6_hdr)) { - struct ip6_hdr *ip6 = mtod(m, struct ip6_hdr *); - icmp6_error(m, ICMP6_DST_UNREACH, - ICMP6_DST_UNREACH_ADDR, - (caddr_t)&ip6->ip6_dst - (caddr_t)ip6); - } else - m_freem(m); - return IPPROTO_DONE; - } - tcp_input(m, *offp, proto); return IPPROTO_DONE; } |