From nobody Sat Jun 03 10:09:07 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QYFvl6jcDz4ZBpn; Sat, 3 Jun 2023 10:09:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QYFvl5Wzkz3NP1; Sat, 3 Jun 2023 10:09:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685786947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ecdi8dQyMe96sxISMJ2y8/zgaEImiKjLJb4piozu5f0=; b=hMTf+7klkXQCb7kr3CwmUwOE/FyTnvdtJk8FdsNyn9YpoJReo03HbKtvSfyKvNZssvgLhN JS6NpJGKM2LRsT8Dk7lsDPvylf4dAAkr068ysCAyks25Z/5ymiF5WeQF9a5CNMxzNC6YJa zgvAn1XEWndsVPs5Qq2oJWfBQ6B8wYhHKPIxRVDaTTmQMG01QmmwnQ2WW2gSFnM644T1wy NynJbbqdIvrlC6lPEsJXvEOwaJkJuneserJOapxNcHDBU1NLRbl2yKKDow8ipRl5Av1fAq QzfrbjsbUb0zHdCKByu5DZUkXD8sAfXQ0bay3h8BitAUnTtnyEd9RfkJeqqZdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685786947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ecdi8dQyMe96sxISMJ2y8/zgaEImiKjLJb4piozu5f0=; b=VL8qqngmZP4YwcOukeSpNqDLDner7b+XoUtsNMekbUGGPGxZ6MjArv/s9Sl2dN6jarg4+f MU/LCTNTUNmmo+oidNish7b91+p0l1GLct4x+HVMt8TGhER0bmxnFtqEvD+BNkpvfXvmxQ FpXtbdz8tZJAiDRWbxcj4KucwXyuz52XGwq0qeHQuBkvrLA8hZ3V/0AOs3lghPdKHU10cf qnqRj7OumUw0RcC1ZWpyhEvHnkP2kJ6vB7tlS8h2COWHHX1Ya7/NFPs/nLFIpZFR+2mZMl xIyPF8UZ7zWv3KZ7YWcVzkUU5vseBzJYE0vg73qYhIKbtDmxu7bTJc4x8f3sjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685786947; a=rsa-sha256; cv=none; b=BVKjM1vu7zXYYtxTKp64ss0KUym/s388fDy+qsVcH1ZWNxc6d8Tr8nI/7P/DXPF+3I/xEn EMQo+eAfxw8cXoCp9KzIpsfCdvDBMgg3XvKlPc/80BWbJh+EZeZ16TfKFxcmHZe0tHFL4X d6FV/EH97pEjI7kWRMsKKnTPO4S4zKRxWOLmhTKw0O9dBTYq9M419ccV52iEwXJUyIzimz rtsavqy1FywGQ6neY1qdvthLAP7xYDXc0yFbzrUNGt3anxm+8yiEjwQ/qNqnLvTNjGWzIy pZf6MnBUcB9ZuvSUujPBkm2iG6EmL44733xobryiS6t6l1YEWvwy7VZpCkD2YA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QYFvl4TRPzM2Z; Sat, 3 Jun 2023 10:09:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 353A97o6025936; Sat, 3 Jun 2023 10:09:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 353A97UN025935; Sat, 3 Jun 2023 10:09:07 GMT (envelope-from git) Date: Sat, 3 Jun 2023 10:09:07 GMT Message-Id: <202306031009.353A97UN025935@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Rabson Subject: git: 4a6b92849e61 - main - pf: Fix tests broken by enabling inet-local filtering List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a6b92849e619c40ca9a78d38339798f2735ec56 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=4a6b92849e619c40ca9a78d38339798f2735ec56 commit 4a6b92849e619c40ca9a78d38339798f2735ec56 Author: Doug Rabson AuthorDate: 2023-06-02 15:58:33 +0000 Commit: Doug Rabson 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