svn commit: r284260 - head/sys/netpfil/pf

[Kristof Provost]

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;