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

Baptiste Daroussin bapt at FreeBSD.org
Sun Oct 27 20:56:24 UTC 2013


Author: bapt
Date: Sun Oct 27 20:56:23 2013
New Revision: 257225
URL: http://svnweb.freebsd.org/changeset/base/257225

Log:
  Import pf.c 1.638 from OpenBSD
  
  Original log:
  Some ICMP types that also have icmp_id, pointed out by markus@
  
  Obtained from:	OpenBSD

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

Modified: head/sys/netpfil/pf/pf.c
==============================================================================
--- head/sys/netpfil/pf/pf.c	Sun Oct 27 20:52:09 2013	(r257224)
+++ head/sys/netpfil/pf/pf.c	Sun Oct 27 20:56:23 2013	(r257225)
@@ -2050,21 +2050,21 @@ pf_icmp_mapping(struct pf_pdesc *pd, uin
 		*icmp_dir = PF_IN;
 	case ICMP_TSTAMPREPLY:
 		*icmptype = ICMP_TSTAMP;
-		*icmpid = 0; /* Time is not a secret. */
+		*icmpid = pd->hdr.icmp->icmp_id;
 		break;
 
 	case ICMP_IREQ:
 		*icmp_dir = PF_IN;
 	case ICMP_IREQREPLY:
 		*icmptype = ICMP_IREQ;
-		*icmpid = 0; /* Nothing sane to match on! */
+		*icmpid = pd->hdr.icmp->icmp_id;
 		break;
 
 	case ICMP_MASKREQ:
 		*icmp_dir = PF_IN;
 	case ICMP_MASKREPLY:
 		*icmptype = ICMP_MASKREQ;
-		*icmpid = 0; /* Nothing sane to match on! */
+		*icmpid = pd->hdr.icmp->icmp_id;
 		break;
 
 	case ICMP_IPV6_WHEREAREYOU:


More information about the svn-src-head mailing list