Date: Mon, 17 Dec 2012 17:16:51 -0800 From: Garrett Cooper <yanegomi@gmail.com> To: "Andrey V. Elsukov" <ae@FreeBSD.org> Cc: "svn-src-head@freebsd.org" <svn-src-head@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org> Subject: Re: svn commit: r244365 - head/sys/netinet Message-ID: <3E7ACF8A-3192-40C1-9F42-C701BF3483CE@gmail.com> In-Reply-To: <201212172055.qBHKtYgX070163@svn.freebsd.org> References: <201212172055.qBHKtYgX070163@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This broke !inet6 kernels. Sent from my iPhone On Dec 17, 2012, at 12:55 PM, "Andrey V. Elsukov" <ae@FreeBSD.org> wrote: > Author: ae > Date: Mon Dec 17 20:55:33 2012 > New Revision: 244365 > URL: http://svnweb.freebsd.org/changeset/base/244365 >=20 > Log: > Since we use different flags to detect tcp forwarding, and we share the > same code for IPv4 and IPv6 in tcp_input, we should check both > M_IP_NEXTHOP and M_IP6_NEXTHOP flags. >=20 > MFC after: 3 days >=20 > Modified: > head/sys/netinet/tcp_input.c >=20 > Modified: head/sys/netinet/tcp_input.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D > --- head/sys/netinet/tcp_input.c Mon Dec 17 20:36:56 2012 (r244364) > +++ head/sys/netinet/tcp_input.c Mon Dec 17 20:55:33 2012 (r244365) > @@ -780,7 +780,8 @@ findpcb: > /* > * Grab info from PACKET_TAG_IPFORWARD tag prepended to the chain. > */ > - if (m->m_flags & M_IP_NEXTHOP) > + if ((isipv6 && (m->m_flags & M_IP6_NEXTHOP)) || > + (!isipv6 && (m->m_flags & M_IP_NEXTHOP))) > fwd_tag =3D m_tag_find(m, PACKET_TAG_IPFORWARD, NULL); >=20 > #ifdef INET6 > _______________________________________________ > svn-src-head@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3E7ACF8A-3192-40C1-9F42-C701BF3483CE>