Date: Mon, 17 Dec 2012 20:55:34 +0000 (UTC) From: "Andrey V. Elsukov" <ae@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r244365 - head/sys/netinet Message-ID: <201212172055.qBHKtYgX070163@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ae Date: Mon Dec 17 20:55:33 2012 New Revision: 244365 URL: http://svnweb.freebsd.org/changeset/base/244365 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. MFC after: 3 days Modified: head/sys/netinet/tcp_input.c Modified: head/sys/netinet/tcp_input.c ============================================================================== --- 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 = m_tag_find(m, PACKET_TAG_IPFORWARD, NULL); #ifdef INET6
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212172055.qBHKtYgX070163>