svn commit: r255260 - vendor-sys/ipfilter/dist/netinet vendor/ipfilter/dist

[Cy Schubert]

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-sys/ipfilter/dist/netinet/ip_fil_freebsd.c

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

Modified: vendor-sys/ipfilter/dist/netinet/ip_fil_freebsd.c
==============================================================================
--- vendor-sys/ipfilter/dist/netinet/ip_fil_freebsd.c	Thu Sep  5 18:18:23 2013	(r255259)
+++ vendor-sys/ipfilter/dist/netinet/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;