From owner-svn-src-vendor@FreeBSD.ORG  Thu Sep  5 18:45:24 2013
Return-Path: <owner-svn-src-vendor@FreeBSD.ORG>
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id B0D119EB;
 Thu,  5 Sep 2013 18:45:24 +0000 (UTC) (envelope-from cy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9EEA62842;
 Thu,  5 Sep 2013 18:45:24 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r85IjOZr024721;
 Thu, 5 Sep 2013 18:45:24 GMT (envelope-from cy@svn.freebsd.org)
Received: (from cy@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r85IjOiZ024720;
 Thu, 5 Sep 2013 18:45:24 GMT (envelope-from cy@svn.freebsd.org)
Message-Id: <201309051845.r85IjOiZ024720@svn.freebsd.org>
From: Cy Schubert <cy@FreeBSD.org>
Date: Thu, 5 Sep 2013 18:45:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r255260 - vendor-sys/ipfilter/dist/netinet
 vendor/ipfilter/dist
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
 <svn-src-vendor.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Sep 2013 18:45:24 -0000

Author: cy
Date: Thu Sep  5 18:45:23 2013
New Revision: 255260
URL: http://svnweb.freebsd.org/changeset/base/255260

Log:
  Grab ip_fil_freebsd.c r1.42 from the ipfilter CVS tree to fix,
  
  	3529491 checksum validation could be better
  	3529486 tcp checksum wrong for ipv6
  
  Approved by:	glebius

Modified:
  vendor/ipfilter/dist/ip_fil_freebsd.c

Changes in other areas also in this revision:
Modified:
  vendor-sys/ipfilter/dist/netinet/ip_fil_freebsd.c

Modified: vendor/ipfilter/dist/ip_fil_freebsd.c
==============================================================================
--- vendor/ipfilter/dist/ip_fil_freebsd.c	Thu Sep  5 18:18:23 2013	(r255259)
+++ vendor/ipfilter/dist/ip_fil_freebsd.c	Thu Sep  5 18:45:23 2013	(r255260)
@@ -1244,9 +1244,7 @@ ipf_checkv4sum(fin)
 		else
 			sum = in_pseudo(ip->ip_src.s_addr, ip->ip_dst.s_addr,
 					htonl(m->m_pkthdr.csum_data +
-					fin->fin_ip->ip_len -
-					(fin->fin_ip->ip_hl << 2) +
-					fin->fin_p));
+					fin->fin_dlen + fin->fin_p));
 		sum ^= 0xffff;
 		if (sum != 0) {
 			fin->fin_cksum = FI_CK_BAD;