From owner-svn-src-head@FreeBSD.ORG  Thu Jun 11 13:26:16 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EB73C21A;
 Thu, 11 Jun 2015 13:26:16 +0000 (UTC) (envelope-from kp@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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D9D1A1BBE;
 Thu, 11 Jun 2015 13:26:16 +0000 (UTC) (envelope-from kp@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5BDQG8f063838;
 Thu, 11 Jun 2015 13:26:16 GMT (envelope-from kp@FreeBSD.org)
Received: (from kp@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5BDQGIh063837;
 Thu, 11 Jun 2015 13:26:16 GMT (envelope-from kp@FreeBSD.org)
Message-Id: <201506111326.t5BDQGIh063837@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: kp set sender to kp@FreeBSD.org
 using -f
From: Kristof Provost <kp@FreeBSD.org>
Date: Thu, 11 Jun 2015 13:26:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r284260 - head/sys/netpfil/pf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 11 Jun 2015 13:26:17 -0000

Author: kp
Date: Thu Jun 11 13:26:16 2015
New Revision: 284260
URL: https://svnweb.freebsd.org/changeset/base/284260

Log:
  pf: Save the protocol number in the pf_fragment
  
  When we try to look up a pf_fragment with pf_find_fragment() we compare (see
  pf_frag_compare()) addresses (and family), id but also protocol.  We failed to
  save the protocol to the pf_fragment in pf_fragcache(), resulting in failing
  reassembly.
  
  Differential Revision:	https://reviews.freebsd.org/D2772

Modified:
  head/sys/netpfil/pf/pf_norm.c

Modified: head/sys/netpfil/pf/pf_norm.c
==============================================================================
--- head/sys/netpfil/pf/pf_norm.c	Thu Jun 11 13:05:37 2015	(r284259)
+++ head/sys/netpfil/pf/pf_norm.c	Thu Jun 11 13:26:16 2015	(r284260)
@@ -824,6 +824,7 @@ pf_fragcache(struct mbuf **m0, struct ip
 		(*frag)->fr_src.v4 = h->ip_src;
 		(*frag)->fr_dst.v4 = h->ip_dst;
 		(*frag)->fr_af = AF_INET;
+		(*frag)->fr_proto = h->ip_p;
 		(*frag)->fr_id = h->ip_id;
 		(*frag)->fr_timeout = time_uptime;