From owner-svn-src-head@freebsd.org Tue Aug 11 17:24:34 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E5EC299EE93; Tue, 11 Aug 2015 17:24:34 +0000 (UTC) (envelope-from oshogbo@FreeBSD.org) Received: from repo.freebsd.org (repo.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 D6EDF1E1E; Tue, 11 Aug 2015 17:24:34 +0000 (UTC) (envelope-from oshogbo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t7BHOY50043120; Tue, 11 Aug 2015 17:24:34 GMT (envelope-from oshogbo@FreeBSD.org) Received: (from oshogbo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t7BHOY2H043119; Tue, 11 Aug 2015 17:24:34 GMT (envelope-from oshogbo@FreeBSD.org) Message-Id: <201508111724.t7BHOY2H043119@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: oshogbo set sender to oshogbo@FreeBSD.org using -f From: Mariusz Zaborski Date: Tue, 11 Aug 2015 17:24:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r286641 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 Aug 2015 17:24:35 -0000 Author: oshogbo Date: Tue Aug 11 17:24:34 2015 New Revision: 286641 URL: https://svnweb.freebsd.org/changeset/base/286641 Log: Use correct src/dst ports when removing states. Submitted by: Milosz Kaniewski , UMEZAWA Takeshi (orginal) Reviewed by: glebius Approved by: pjd (mentor) Obtained from: OpenBSD MFC after: 3 days Modified: head/sys/netpfil/pf/pf_ioctl.c Modified: head/sys/netpfil/pf/pf_ioctl.c ============================================================================== --- head/sys/netpfil/pf/pf_ioctl.c Tue Aug 11 16:51:44 2015 (r286640) +++ head/sys/netpfil/pf/pf_ioctl.c Tue Aug 11 17:24:34 2015 (r286641) @@ -1665,13 +1665,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)