From nobody Thu Sep 19 20:21:15 2024 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 4X8n3H4psDz5XL16; Thu, 19 Sep 2024 20:21:15 +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 4X8n3H3x3Hz4WT5; Thu, 19 Sep 2024 20:21:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726777275; 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=pM4lFGHD8LDbnMqgQeFWCr+R4/O1i/cheykxGfbGBQE=; b=dZnIA5jY+cxq3VbxH4b7OPvE1dAXMe+c+aSM05w556KXAbF5esxRV6AjcnaxnRZ4GZ0GK+ N0OB20m+wli7ToGC7kk5J5UIBDJDSTKiytykgjbddG4ZpHPnJazR3jqSlzX2AxfhKN8jA4 9iYm29Qe/rZLHyWBs83ML19u6n7TXH6WUOimUE9Wz66GcQT/3ZIw5GL9mUHcB6dg/i3gsq z569GEp0ehUyBzD1RX1tEXadZk1SsMdKN5yJl3UPl9FEe+RBIQTZLgba4OhGr57YyUR/4X f5YpAWR0pxld9XUVCD1lDk1YVzALk17XuO/Sjz+m7JALCKaCqPQb7J/1P3PdZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726777275; a=rsa-sha256; cv=none; b=InlAvujmEl9wmsOo/zVgK6V4ItJDpmRigEbzraoCH+HONXQ3EZAkwGfGVKXoCtrP7qCxjl mhMV+6+WASTEFf6wgHNPOVgZxMma0aiZeAGmHaFbgC7tXvhlstlQVL4uJsUL4EgZxwpOye +kpFRTWBCrP2p6KZlexcdtevt0ZQ0x0VUvn0jguPzPZmf9mBRbTpeWUN6jHNLFrqh1Vr+t i3SAyQXh6FQ83WyILHmiu1VTzQd/twDIv55+hd11YY+0rXv7AgKAHA1N4MK7/z/geZASP0 C2Gx2oGsQ3QI4mHBDD5aySnmFsS8COSuRjakfAz2o01gQS9r10AJpZR0umzjaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726777275; 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=pM4lFGHD8LDbnMqgQeFWCr+R4/O1i/cheykxGfbGBQE=; b=P4TKcTNXKLMPjkSfueWtOQnbqXGJEESBz7ctQ9+7UNOhrKFXpU4hyiM9Js91J+fYVx1vYb oKQ+nAtpkytFJ3NKSC1mvwv8S209ZbCie+R6CLwhRB5Lb2glU9CWtykaR+xjgsuCxqjYp5 h8VzZJmO2IoLMVDAQlTlEIpUmV02wGE9pOcAiC3ra88rLMoMUIHCl3eEK7cUUpjfTZ9fSC G/pTwmbVBxYgcTIM3tdOQEi+6U2mCZz8mVJX2l4pnTIQezl81W8K3fsquki9PqDKh8IooD sRYBCzbV4OyVtADRHmhNfw3IO1ifuv/AnFna0rsC6ZQm2CuDS69GE2+VT4LIcA== 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 4X8n3H3Wr8zKsX; Thu, 19 Sep 2024 20:21:15 +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 48JKLF8R046263; Thu, 19 Sep 2024 20:21:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48JKLFie046260; Thu, 19 Sep 2024 20:21:15 GMT (envelope-from git) Date: Thu, 19 Sep 2024 20:21:15 GMT Message-Id: <202409192021.48JKLFie046260@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: e044f67a66c8 - main - pfctl: improve bitmask printing 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: e044f67a66c82721b419949132fc48261ee39555 Auto-Submitted: auto-generated The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=e044f67a66c82721b419949132fc48261ee39555 commit e044f67a66c82721b419949132fc48261ee39555 Author: Kristof Provost AuthorDate: 2024-08-29 11:48:41 +0000 Commit: Kristof Provost CommitDate: 2024-09-19 20:20:12 +0000 pfctl: improve bitmask printing In some cases the netmask gets set to a full 128 bit mask even if no address family is selected; don't print the v6 mask if it's a v4 address. Obtained from: OpenBSD, mcbride , f6d7b41f07 Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D46584 --- sbin/pfctl/pf_print_state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/pfctl/pf_print_state.c b/sbin/pfctl/pf_print_state.c index 0b862273fab3..96da1e109fa8 100644 --- a/sbin/pfctl/pf_print_state.c +++ b/sbin/pfctl/pf_print_state.c @@ -128,7 +128,7 @@ print_addr(struct pf_addr_wrap *addr, sa_family_t af, int verbose) PF_AZERO(&addr->v.a.mask, AF_INET6))) { int bits = unmask(&addr->v.a.mask, af); - if (bits != (af == AF_INET ? 32 : 128)) + if (bits < (af == AF_INET ? 32 : 128)) printf("/%d", bits); } }