svn commit: r295894 - stable/10/sys/netpfil/pf

[Renato Botelho]

Author: garga (ports committer)
Date: Mon Feb 22 17:18:36 2016
New Revision: 295894
URL: https://svnweb.freebsd.org/changeset/base/295894

Log:
  MFC r286641 (from oshogbo):
  
  Use correct src/dst ports when removing states.
  
  Submitted by:	Milosz Kaniewski <m.kaniewski at wheelsystems.com>,
  		UMEZAWA Takeshi <umezawa at iij.ad.jp> (orginal)
  Reviewed by:	glebius
  Approved by:	re (marius)
  Obtained from:	OpenBSD
  Sponsored by:	Rubicon Communications (Netgate)
  Differential revision:	https://reviews.freebsd.org/D5392

Modified:
  stable/10/sys/netpfil/pf/pf_ioctl.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netpfil/pf/pf_ioctl.c
==============================================================================
--- stable/10/sys/netpfil/pf/pf_ioctl.c	Mon Feb 22 14:54:50 2016	(r295893)
+++ stable/10/sys/netpfil/pf/pf_ioctl.c	Mon Feb 22 17:18:36 2016	(r295894)
@@ -1661,13 +1661,13 @@ relock_DIOCKILLSTATES:
 				if (s->direction == PF_OUT) {
 					srcaddr = &sk->addr[1];
 					dstaddr = &sk->addr[0];
-					srcport = sk->port[0];
+					srcport = sk->port[1];
 					dstport = sk->port[0];
 				} else {
 					srcaddr = &sk->addr[0];
 					dstaddr = &sk->addr[1];
 					srcport = sk->port[0];
-					dstport = sk->port[0];
+					dstport = sk->port[1];
 				}
 
 				if ((!psk->psk_af || sk->af == psk->psk_af)