From nobody Sat Dec 13 21:50:35 2025 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 4dTKkh0jpYz6K8H2 for ; Sat, 13 Dec 2025 21:50:36 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dTKkh00ngz40dq for ; Sat, 13 Dec 2025 21:50:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765662636; 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=YrcR1LUoH0g+XSrj+N7xYdpdkjTGmphAkVO8D0AfBcQ=; b=lIx0x/XE9AtjCqi7wpWw00ydZgh9z5UFdBxDWJsk13vn6kG1RCeIIFh2yP/nXtVVi9Llnu R5ru+OWNy/Cz7n/x9sY79pojmXfxXzNOfv9XU1lt8kOe4d+CGRtXhWjaVOpjysBCysXSlC LUXNNw/o3rRROn9DzZGRPDqf594mIt3LWVbzgqR+nl+L3Z/o37xWzk8tUBNhu8d3EXYDBE sw462UQRiB+ZzUcQENj6TzLu5PKkOnhKjKQ0PeCsHS/nJbe2OOV8Mrh/VKKyOWX9DeeSMl QxuFa53Scl9G+NzGFHZ3v7rkmrxXiCob3Z/8BzCEYtRjgYb9KoruneYnZP4qEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765662636; 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=YrcR1LUoH0g+XSrj+N7xYdpdkjTGmphAkVO8D0AfBcQ=; b=LLJZ9W/Te7m6ulWrzgx7H5uT3WhkNIvFcn3p4cNDjF3LLnGjtzIXwbF6zyj7geZ97gMChZ Hzh7C0m9mJkk1UmRkzmFUPhizgefpoQKjlHnpapAIhbQLhTYNJt6s9Vcl+aNC+GHpEnnGb apa+cdD6Q7E3Bev3geqvO0NUPChNnClgxnUC2cbjXzIq34eaHrPa9Yt6pfKcu6PxMs2Zpx 5T6c4kKmKQh8ykWpF95HCwXrUX7ZU3oJhyDHunEJFSvZhdJh7nGlRhxvLb5f2ozG5Kfjq3 k8Pb4RQJgKw2+79wT26E5xpLsOON0WUVSptSMIYSb+ZmYZcHoi1uwmxqnKWdZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765662636; a=rsa-sha256; cv=none; b=X3hZrze4gYQ4qwGKOHgj5oOvX/sxyZFV3GQjtM7rudBhcHIGFMOoP5ZApcvX79/3ecRFmB agXo17oWCcmImKn/aUtFa1r6jIv3S1xN1NMiAGPB6yqKpFUzEKX8OMOO65uIewsziGEePD c0DlZs5CiIJoEwrgQ6f8Bkj9e052hdMXkTSByUDc09D/ggBmlEx1lfVagPM63hQrk3E/NM SxSzup8jEbwGsXz3t23YOvGXw1DEEGbEp7jksWRHkJ/TA+FJ206fa6EBg8ood4UCy0Czuo yQp8r+8+11qGXENgCUFH+ocI5KvwWa2nzLC/D4nHF9WmChYchxB4M+EqRBKtIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dTKkg6W75z1KlM for ; Sat, 13 Dec 2025 21:50:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 35dce by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 13 Dec 2025 21:50:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 1dee2336ab44 - main - pfctl: report ICMP states consistently for IPv4/IPv6 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 1dee2336ab44e604f4871c46e7ccb2f7f1e33054 Auto-Submitted: auto-generated Date: Sat, 13 Dec 2025 21:50:35 +0000 Message-Id: <693ddfab.35dce.35d7e471@gitrepo.freebsd.org> The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=1dee2336ab44e604f4871c46e7ccb2f7f1e33054 commit 1dee2336ab44e604f4871c46e7ccb2f7f1e33054 Author: Kristof Provost AuthorDate: 2025-12-12 17:07:19 +0000 Commit: Kristof Provost CommitDate: 2025-12-13 21:50:22 +0000 pfctl: report ICMP states consistently for IPv4/IPv6 Remove the '#ifndef INET6', which never actually mattered because this define is never set. This makes us report ICMP states for IPv4 and IPv6 the same way (and also aligns us with OpenBSD). This means we will now always report state 0:0 rather than NO_TRAFFIC:NO_TRAFFIC for icmp6 (like we already did for icmp). Reported by: Lev Prokofev Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pf_print_state.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sbin/pfctl/pf_print_state.c b/sbin/pfctl/pf_print_state.c index 417ff70de975..1c5a46f86b35 100644 --- a/sbin/pfctl/pf_print_state.c +++ b/sbin/pfctl/pf_print_state.c @@ -324,13 +324,8 @@ print_state(struct pfctl_state *s, int opts) } else if (proto == IPPROTO_SCTP) { printf(" %s:%s\n", sctp_state_name(src->state), sctp_state_name(dst->state)); -#ifndef INET6 - } else if (proto != IPPROTO_ICMP && src->state < PFOTHERS_NSTATES && - dst->state < PFOTHERS_NSTATES) { -#else } else if (proto != IPPROTO_ICMP && proto != IPPROTO_ICMPV6 && src->state < PFOTHERS_NSTATES && dst->state < PFOTHERS_NSTATES) { -#endif /* XXX ICMP doesn't really have state levels */ const char *states[] = PFOTHERS_NAMES;