Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 3 Jun 2023 10:09:07 GMT
From:      Doug Rabson <dfr@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 4a6b92849e61 - main - pf: Fix tests broken by enabling inet-local filtering
Message-ID:  <202306031009.353A97UN025935@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by dfr:

URL: https://cgit.FreeBSD.org/src/commit/?id=4a6b92849e619c40ca9a78d38339798f2735ec56

commit 4a6b92849e619c40ca9a78d38339798f2735ec56
Author:     Doug Rabson <dfr@FreeBSD.org>
AuthorDate: 2023-06-02 15:58:33 +0000
Commit:     Doug Rabson <dfr@FreeBSD.org>
CommitDate: 2023-06-03 10:07:56 +0000

    pf: Fix tests broken by enabling inet-local filtering
    
    Summary:
    Three of the pf dummynet tests were using filter rules which matched
    both the intended epair interface as well as lo0 which now receives
    PFIL_OUT events for messages delivered to the local network stack (if
    enabled). This commit changes the rules to match only for the expected
    epair interface.
    
    PR:             268717
    Reviewed-by:    kp
    MFC-after:      2 weeks
    Differential Revision: https://reviews.freebsd.org/D40393
---
 tests/sys/netpfil/common/dummynet.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/sys/netpfil/common/dummynet.sh b/tests/sys/netpfil/common/dummynet.sh
index c3d0588045c8..6f7981a043a8 100644
--- a/tests/sys/netpfil/common/dummynet.sh
+++ b/tests/sys/netpfil/common/dummynet.sh
@@ -55,7 +55,7 @@ interface_removal_body()
 		"ipfw"	\
 			"ipfw add 1000 pipe 1 ip from any to any" \
 		"pf"	\
-			"pass dnpipe 1"
+			"pass on ${epair}b dnpipe 1"
 
 	# single ping succeeds just fine
 	atf_check -s exit:0 -o ignore ping -c 1 192.0.2.2
@@ -102,7 +102,7 @@ pipe_body()
 		"ipfw"	\
 			"ipfw add 1000 pipe 1 ip from any to any" \
 		"pf"	\
-			"pass dnpipe 1"
+			"pass on ${epair}b dnpipe 1"
 
 	# single ping succeeds just fine
 	atf_check -s exit:0 -o ignore ping -c 1 192.0.2.2
@@ -146,7 +146,7 @@ pipe_v6_body()
 		"ipfw"	\
 			"ipfw add 1000 pipe 1 ip6 from any to any" \
 		"pf"	\
-			"pass dnpipe 1"
+			"pass on ${epair}b dnpipe 1"
 
 	# Single ping succeeds
 	atf_check -s exit:0 -o ignore ping6 -c 1 2001:db8:42::2



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202306031009.353A97UN025935>