From nobody Wed Feb 12 19:39:08 2025 X-Original-To: dev-commits-src-all@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 4YtTCL00zJz5nGj5; Wed, 12 Feb 2025 19:39:10 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YtTCK1MVqz3Xhf; Wed, 12 Feb 2025 19:39:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739389149; 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=wUYBEO3HRh8mk6zR5dX6FNXmcwGrQkXl2sI0J508nvs=; b=FY+iOy4nRLgEnV5557tBDXNlewESxMb6RzF4pDflbRpPpzqWYqLUzPRo/nEwrL/j7J/RxP 979C1wjP+xhnlmi8/3e3JCyNopK4zv+EknuVcaYV2I7UfuCzLsA7N/xZrD7jJzBr4EMPMK VjAhU68Y6yC1JrY7fEwVnVWD4fZo5qgugbOs1Dite0ArFNtvkX5/JorSnVlhqkxwnyemg9 8an1+lxfiVEv4S11AGA8zgC4O5O+l4naRZz9q1ib1TY4sjXS7q+LaJwuHTF9/XN/w9P9GW +En00wj3Te7cvw8ENAFc2udq/x3gdsuUZ3rEE7CaOyqe+8w1J0Z22OlWTwXD+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739389149; 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=wUYBEO3HRh8mk6zR5dX6FNXmcwGrQkXl2sI0J508nvs=; b=Oz33hbeAmCL3gAteIqd1xyAWz7hknOZVSLQFuBAVIZDQjUGZzwebjvo9n6qhtAKAMThg84 sKqtCAQIXRgFgxUl9nSpUBpJcavXTvaPTE7IyI8L3SxnX1HzjblZ+YMclLSed44AZ6mTV6 ITAFZXbHnmN5p8JLemc1qF5iYVqSUgV5LEPAO7L4DegQrj1eMM2z+9KPfrsME43gtHYAj4 Jl35zX2lS4rxvUOEnCvVXLe0uc07Pj8Kfo/rkTfrFLufXW3OJVSukz2nEQvxN4qqeS5Cws Jd09rlxKaiw0/3UMdKuh7nSLbjswZ0iYX8FNhim1dzVTEfpwYxfTgc8t+uQD4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739389149; a=rsa-sha256; cv=none; b=J6suK2tgJCB5iPlTczm83ims9t6bsIg8zdDK+vZiZryExTt8uw24s3eVFWwYBRqbVPMsXI /XFqLUby9GkaAG78ssCcZExRyWs2n2BLr5gPUhO3HIi5rgLott6m69DRe5VAHnxWU+m7Kc mxUEelLfgvgTQewYqREyQA4E4mfYWJPIjb/PNxXQ7vwiKMXjv4nVSNnS3mrzd48PdrAJr7 f3ZlF0gC2mk9zHdbxrA9B6zw1fqsg6cf8A7IXdDsEnWwTKay0E87rxDYzOMdWLegwGmzPk e/xZTbbc6nCe0UI9QQxKR20oJ07RGEi8fx+KECm0l5eq6A5ot1O25QKhaIh28Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YtTCK0drkz1BlC; Wed, 12 Feb 2025 19:39:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51CJd8f1061714; Wed, 12 Feb 2025 19:39:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51CJd8ww061711; Wed, 12 Feb 2025 19:39:08 GMT (envelope-from git) Date: Wed, 12 Feb 2025 19:39:08 GMT Message-Id: <202502121939.51CJd8ww061711@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: b53a787d23e5 - main - pf: fold the UDP, SCTP and other case into one List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b53a787d23e5fbb9e6133ccaef33c917fbb7f83b Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=b53a787d23e5fbb9e6133ccaef33c917fbb7f83b commit b53a787d23e5fbb9e6133ccaef33c917fbb7f83b Author: Kristof Provost AuthorDate: 2025-02-06 15:26:53 +0000 Commit: Kristof Provost CommitDate: 2025-02-12 19:38:38 +0000 pf: fold the UDP, SCTP and other case into one After the pf_test_state folding we can collapse the UDP, SCTP and other cases in pf_test() as well. Inspired by: OpenBSD, henning , 644c98137c Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/netpfil/pf/pf.c | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 3f9e5473deea..3a56e6855d6f 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -10271,23 +10271,13 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 break; } - case IPPROTO_UDP: { - action = pf_test_state(&s, &pd, &reason); - if (action == PF_PASS || action == PF_AFRT) { - if (V_pfsync_update_state_ptr != NULL) - V_pfsync_update_state_ptr(s); - r = s->rule; - a = s->anchor; - } else if (s == NULL) - action = pf_test_rule(&r, &s, &pd, - &a, &ruleset, inp); - break; - } - - case IPPROTO_SCTP: { + case IPPROTO_SCTP: action = pf_normalize_sctp(&pd); if (action == PF_DROP) goto done; + /* fallthrough */ + case IPPROTO_UDP: + default: action = pf_test_state(&s, &pd, &reason); if (action == PF_PASS || action == PF_AFRT) { if (V_pfsync_update_state_ptr != NULL) @@ -10299,7 +10289,6 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 &pd, &a, &ruleset, inp); } break; - } case IPPROTO_ICMP: case IPPROTO_ICMPV6: { @@ -10329,17 +10318,6 @@ pf_test(sa_family_t af, int dir, int pflags, struct ifnet *ifp, struct mbuf **m0 break; } - default: - action = pf_test_state(&s, &pd, &reason); - if (action == PF_PASS || action == PF_AFRT) { - if (V_pfsync_update_state_ptr != NULL) - V_pfsync_update_state_ptr(s); - r = s->rule; - a = s->anchor; - } else if (s == NULL) - action = pf_test_rule(&r, &s, &pd, - &a, &ruleset, inp); - break; } done: