From nobody Thu Oct 9 12:36:46 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 4cj8Wf3zWzz6BrtK; Thu, 09 Oct 2025 12:36:46 +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 4cj8Wf2LQ6z3Z91; Thu, 09 Oct 2025 12:36:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760013406; 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=yeiPrI7KJrEHTuQBI9wF7DV+/CDzPK0VSFP58sWxklk=; b=LHi1DNfKqt5kMat6ST32IYHi/RenFoUeZODYi7r6d2Ogxh6DziujXXRb1yEM9hd23RYaVp i0Oioz1sDzqqhpcQNz6mk0MHr65+xPKsnl44jlMUNnwy+AMztGK6FA6OZ7J2LWXFWV1YrM M5oc5HDsRkTVmaA2cUxMvHx2kRzvBBL7jrvHtwyH1Z7SGkxWGN9D3RE8h4+e7LAZcNX324 p9OHcS5GWXxvBRN3zFbDHOZZyyRlKWaJfFAeBkqlEwR1Ol9z2PWeRy7J7Y0twP6oJThNB6 Hh2kNnVVOWBDNPzVr9FZR5m5HV8loQPQGRlAGPI05xA/l/dzxJEN/UkKqMRLWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760013406; 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=yeiPrI7KJrEHTuQBI9wF7DV+/CDzPK0VSFP58sWxklk=; b=Hra8IVi0s2zPJcKQgvzZmr3RsFfMpf0SO3yBTHdaBvXX2kLAYauWkXkHHnQUzpbyqMJ6Bu MoqZ27SS9kBm/sIrJGQZxJSqZf9LNZ1mgw8cENdhuYscaKvyH5pzKSxjKvxBHJ+geiF3BP IUnFL8As2TlQQw/KHNG8i9bVKGYfwXyFBRTYcP3mDTKVFGcwKBOgoGyGAkO9Lzix1HkTN4 sZd3sw2TQi5btmU8UJK6/RHdejHTfi2Brd9rKuJ8k95zgqRPSq0/zIWR019zitgK0WK7YN EQtvNZmSI4FNUeX6WnjOFZWDJKha8qPfwWOeEX0//u5FZaiJB6LbPnCD/YqmVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760013406; a=rsa-sha256; cv=none; b=QNL0Mq6NMrbiZtI+lNFjKxC8G9oruPLFMZNwCpGM0VLlY+6S47VJu7Bh9FAQVIVF75tsvm NFmMKZK5pn0cTYiojglQuLhQnXLMpFjHflhZgFQub0aCPMN7eK1koQWeyLOjPD/ofMrcGd qkal86MuwfqeXVJ90/YPPgSoxXbgsFGObjwAThoSemL1xkzVCajz3xijVZhXz/eh0i2/4a gaGGQNNpF60H1s0toa2treSzitwVMuKFE9EKoFJVmNl5gDsogDuAZCU/HoCu6ifM15jfj8 LFlKooUoA9iDo1EQ4nh7yBlfLvyndQcicqLuebvcgKfKuqF6wizCOEbKI12pKw== 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 4cj8Wf1xzRz2hx; Thu, 09 Oct 2025 12:36:46 +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 599CakfX072220; Thu, 9 Oct 2025 12:36:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 599CakX6072217; Thu, 9 Oct 2025 12:36:46 GMT (envelope-from git) Date: Thu, 9 Oct 2025 12:36:46 GMT Message-Id: <202510091236.599CakX6072217@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Cy Schubert Subject: git: ce85861e680d - stable/14 - ipfilter ippool: Prefix deleted entries with "#" 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: cy X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ce85861e680d5af37e35cdda168de5b66013fd46 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=ce85861e680d5af37e35cdda168de5b66013fd46 commit ce85861e680d5af37e35cdda168de5b66013fd46 Author: Cy Schubert AuthorDate: 2022-11-02 05:34:54 +0000 Commit: Cy Schubert CommitDate: 2025-10-09 12:36:39 +0000 ipfilter ippool: Prefix deleted entries with "#" To maintain consistency with ippool list functions, prefix deleted entries with "#". (cherry picked from commit f3ff6abb9d816a68e65af5ed55552d152a58b5e4) --- sbin/ipf/libipf/printhashdata.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbin/ipf/libipf/printhashdata.c b/sbin/ipf/libipf/printhashdata.c index 690243d63f1e..ba96a75a94d7 100644 --- a/sbin/ipf/libipf/printhashdata.c +++ b/sbin/ipf/libipf/printhashdata.c @@ -37,6 +37,8 @@ printhashdata(iphtable_t *hp, int opts) } PRINTF(" role="); } else { + if ((hp->iph_flags & IPHASH_DELETE) == IPHASH_DELETE) + PRINTF("# "); PRINTF("Hash Table %s: %s", ISDIGIT(*hp->iph_name) ? "Number" : "Name", hp->iph_name);