From nobody Wed Jul 02 08:27:10 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 4bXCgM0hCFz604dg; Wed, 02 Jul 2025 08:27:11 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bXCgL5fnRz3Z7H; Wed, 02 Jul 2025 08:27:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751444830; 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=MDLLuhRYJ5mDLBSGatOSaM4+awt+XBpk2crzCHQ6q3A=; b=XlX/8xSatW99qkjYvOSrOPER5H5zUTzA9OWbCZT64JRIlZZikmFBrdLlptj8vqGR7/ACq7 +vArUB0GNd0HOD3lvOjFkxYvpccImEEqFCbTwemOhkoRmwdN6NemS4wQ6ar0bj5Liq5gom y9iD2Q2t3/OGIWHEpNOOntmri2CgcM8tAo2roVDbpNQ5Y4UcEMJ6Xg3zv9IFRPbXIU+6ws kvAtQtUlGGklZreL+Be+07jZ8HCje686CvZACopk2MPthI6rkeq+aOFhrEwNhfObpUpqTs AG2DDPji+Ewxa6NqadBAUA/BavtLX/vpEbu96IfRhqPkDIXiLNNPpwGTbcQ+HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751444830; 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=MDLLuhRYJ5mDLBSGatOSaM4+awt+XBpk2crzCHQ6q3A=; b=v2rTvvOb3wgEmOWi8mek/UbqfBYo2gGDmR+wBs8NkTY2H46j46iUnI88WHGwNQ+PGwmpBk 7h/tKkDNAuiGkkdIlns1OuXTSJ2g6xRM/jkmRELQVsPfvkDed0UgcsQSEJW/IhrQP3LdwO V6zKyXVAQcsV2ufI9TkgxsW+ngr7zAdDVtD//Bm8ByvfEdhyinevlbtGSg0NQDhzl9liRn OL1VByEmccvZWt/Y0RaYnTBZVJ9gGyRnSu+2G+ixoQr5ScauPZYSCiXxRj8s2qv1jTk9/k oB+zlr2NXFVBU9PJAXtpIxuZhGysMKStcUb1m1tKK0TGDJ7VpXWamMLPPz67fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751444830; a=rsa-sha256; cv=none; b=SUVpkycGYIx6r5UHBucWNWNBMvsNExTssW5NjZz4t9ex29OCZe37rHWWnHZfeH5cMehWXS Aq0WTDDICeUCrID31nS9L3CwbUYRVsI2ijqtv6RBRvXeTAddJCQBpYjS4NLu+5robiO28c 8pU84yO9Fu3bb/2h4JysduExKCVpU3QTgx3xciTetXOeVRDDCV0b7ILgci/97BE6LsNPip G/GJsnG4CoKUbCjZNv9jaya5rtm9ePoTgnkcELy/Aeb55sRMswFfa4sCsozXPCnzis5x5S aE6kMq4t9V6Ze0aLDPpo9V/1z7PZ3uLjTtngK9imwan//7q0Y7ED97ku0IiZWA== 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 4bXCgL5B3cz1BVK; Wed, 02 Jul 2025 08:27:10 +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 5628RAQi025488; Wed, 2 Jul 2025 08:27:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5628RAUf025485; Wed, 2 Jul 2025 08:27:10 GMT (envelope-from git) Date: Wed, 2 Jul 2025 08:27:10 GMT Message-Id: <202507020827.5628RAUf025485@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: f0cf95809b40 - main - pfctl: Fill netmask AF-independently in print_host() 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: f0cf95809b407b4a8e81beed1642f27b0810ce44 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f0cf95809b407b4a8e81beed1642f27b0810ce44 commit f0cf95809b407b4a8e81beed1642f27b0810ce44 Author: Kristof Provost AuthorDate: 2025-06-27 12:30:11 +0000 Commit: Kristof Provost CommitDate: 2025-07-02 07:40:52 +0000 pfctl: Fill netmask AF-independently in print_host() Instead of masking the host address in two different ways, just fill it no matter the address family. In case of AF_INET, setting the extra 96 bit does not hurt. While here, stop resetting `af' for no reason and move up the variable declaration. OK benno sashan Obtained from: OpenBSD, kn , 53f568abff Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/pfctl/pf_print_state.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/sbin/pfctl/pf_print_state.c b/sbin/pfctl/pf_print_state.c index 821c0745748a..433d1d4e0b7b 100644 --- a/sbin/pfctl/pf_print_state.c +++ b/sbin/pfctl/pf_print_state.c @@ -167,19 +167,14 @@ print_name(struct pf_addr *addr, sa_family_t af) void print_host(struct pf_addr *addr, u_int16_t port, sa_family_t af, int opts) { + struct pf_addr_wrap aw; + if (opts & PF_OPT_USEDNS) print_name(addr, af); else { - struct pf_addr_wrap aw; - memset(&aw, 0, sizeof(aw)); aw.v.a.addr = *addr; - if (af == AF_INET) - aw.v.a.mask.addr32[0] = 0xffffffff; - else { - memset(&aw.v.a.mask, 0xff, sizeof(aw.v.a.mask)); - af = AF_INET6; - } + memset(&aw.v.a.mask, 0xff, sizeof(aw.v.a.mask)); print_addr(&aw, af, opts & PF_OPT_VERBOSE2); }