From nobody Mon Sep 05 13:06:19 2022 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 4MLpgJ0qLnz4cMgT; Mon, 5 Sep 2022 13:06:20 +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 4MLpgJ0154z3hLS; Mon, 5 Sep 2022 13:06:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662383180; 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=Ax8hf7rKEEW9pUD0fufWCE3yu5ymwYf76asKYy9p7p4=; b=sTg6h3UGwnMkkyTgPYAp9Y/XPtOEyHQY3SX+LAN7YXK/M9T1J+ORtFc5JpR5b3dlev9Ln5 Mx5nEBrXA7QwJezbYggeo8YJCktowARoiCsvNHoxZ9FOPFCpIvqs2fTyURBuH/vMXNuozu V5cZbYROzua9NmYdl1Z4wP79CZD3JHii0G9upaTBWmCFftCil4A5QPRgNZE7/p8rUTSgZA BfS0n7mCePF2cc4F6N4Ud6lTzcHb7bvAUVwbovnzr4G1WT5sZAkGrg4uDQxk6dHqVakYpD wxrpjcbgzl4K4H4rP2nGdeIUT52EpHGoZZnI2r4VhDp9qn0qMy90I8iIkh2OYA== 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 4MLpgH6952zqX2; Mon, 5 Sep 2022 13:06:19 +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 285D6JLO064583; Mon, 5 Sep 2022 13:06:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 285D6JN0064582; Mon, 5 Sep 2022 13:06:19 GMT (envelope-from git) Date: Mon, 5 Sep 2022 13:06:19 GMT Message-Id: <202209051306.285D6JN0064582@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 9503043f6e64 - main - pf: stop using PFIL_FWD 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: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9503043f6e64a92d3c35cd8aa932727685378ad0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662383180; 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=Ax8hf7rKEEW9pUD0fufWCE3yu5ymwYf76asKYy9p7p4=; b=uMN7PsHnG8mS+25OSmEqwVQIno5gk3S7aEtLHF7OtILKe+7M5BVmEHF5X0OjiVV+fL08Qs x5YalfnQ/GxZjNfqwGJj00g0f3EKOj8wTIVBDUPg0bnrL8mq6cHPsKC70qNUGDcSnOYQgW qIluNqq4SLm0GeW6zFVf/hpfdlkTxXuabWzMJfgnKh/PLEsyD+Fs6BTAugsHvqy/Wh5RdR dMQZwzpuLwmfrc5pR/yT3R3fNt/uf/jd0CKsG/e/ytvlM8qEk0dGHMg8OphunjBZvjUQWD pLCfcqr6xEQMd76UCX4a5/WrWYrT2Kj5jhMk/nu6ys0ydSr1gmYfm5mpKC2NwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662383180; a=rsa-sha256; cv=none; b=czryt63hjwV/INQfjohyUaWLTsYu95IcZ2/EWHROZYcKAWin/BMyfRyoNX64b/fhyRpiIS Jb/RBrARxZe73QGvNziRGuAWjaLy5yv8QOTHdFpGUoDRjax7CEXft6rOXwoFJV/N3CKj5I wLhgpXY3FGqy6djN2XqCwZxQRtJxtkS/DVwhx5wbakDFQosNT4Kmq/kLUCohoyC4/6BzP/ mkzl81IeHQI0GI0o3k5KfufwLW+6YIYZU33CRnx6BR3MI/mm/5hM+tvdi8o7227kurXvnO oJ3CVm8Ps3zKg9cwNgVQ0bY2tziV7NEKTfgUa+lx5TNtUUK1u65bX/rcboS7ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=9503043f6e64a92d3c35cd8aa932727685378ad0 commit 9503043f6e64a92d3c35cd8aa932727685378ad0 Author: Mateusz Guzik AuthorDate: 2022-09-02 16:36:52 +0000 Commit: Mateusz Guzik CommitDate: 2022-09-05 13:06:12 +0000 pf: stop using PFIL_FWD It is only there to check if the packet was reassembled, relevant if we are forwarding. But if the packet originated locally it could not have been reassembled, thus the flag is redundant. Reviewed by: kp Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index e2f8b428fb14..b46c16659ddb 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -6633,7 +6633,7 @@ pf_route6(struct mbuf **m, struct pf_krule *r, int dir, struct ifnet *oifp, goto bad; if (dir == PF_IN) { - if (pf_test6(PF_OUT, PFIL_FWD, ifp, &m0, inp) != PF_PASS) + if (pf_test6(PF_OUT, 0, ifp, &m0, inp) != PF_PASS) goto bad; else if (m0 == NULL) goto done; @@ -7929,7 +7929,7 @@ done: PF_STATE_UNLOCK(s); /* If reassembled packet passed, create new fragments. */ - if (action == PF_PASS && *m0 && (pflags & PFIL_FWD) && + if (action == PF_PASS && *m0 && dir == PF_OUT && (mtag = m_tag_find(m, PF_REASSEMBLED, NULL)) != NULL) action = pf_refragment6(ifp, m0, mtag);