From nobody Thu Oct 9 12:37:03 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 4cj8X05lyrz6Brr2; Thu, 09 Oct 2025 12:37:04 +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 4cj8X01CmXz3Zt4; Thu, 09 Oct 2025 12:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760013424; 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=nSN9UMfZ+IMJoXgxVaKGuWNLdDFaTGalWHd5PBlG1lQ=; b=a9ZEDYmXCH+E4aM3XCFlKnpO5H0nGpVo2DOV6GbnLIMmGIy0AMMKi8UE+bA/+Q624zTLo8 DIe46kgSjL15Uup79MYgPxFrX2FqGdo2ykVjHj9O5mGT/+efVEzOZX7gxpc+eP5YXak6Y7 r11l9q6O7P5ow8wQXkuWFlrESBswo/GtMpAUSCnFIprKYzSe4yy3Osh/VBxxgme8vI37xE O2K0tS6N+temX3BrhIlu01KVrKObn7Qj/TRIihxS/ERIo0CgmHlvtWFuVyhYtgNMwFnOcx aH1qUHr7lFjuj7gmGsoMCUv4FnC7ujSAE19+xFWcNCaPd9Fkdp6Mcc6sZdwHpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760013424; 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=nSN9UMfZ+IMJoXgxVaKGuWNLdDFaTGalWHd5PBlG1lQ=; b=N43YrgrrfiAyRZxdy7pp8t7APRqlHesA7OByCeOSVBPJelaVITMpGB71+GxrmxwdVuR3Mp m3aiZfG6ob+nn60mnA81IMiw9EdzU2D5F56IIqf/gMXpwdf8E6hwVX5wbSlHfVFeIwPmwg MmgDD7oTq1Z7yQQy8XAqy0qjnYx9wFae8d1iK98l2RulIt4zZl3ScZPGD86amB3xXY9yBz Mdp60d4LQB+UyTbxiucZVobRT3vfc5yWOWZ93Ji9eG5arpUubFL8DZU6vDbAyfXjs9kzT0 7/LCFVcUChtOxU6ulBSc7c4n00KZQ49duEafZ2DzgBHbKE4SAPtPaW8WHlrjDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760013424; a=rsa-sha256; cv=none; b=hue9M7ktlJN74FGAkRm8ylGhGVcZwlWTX2r8ln1+jf9vpOod3H5yNs9zBg0nEtZ5g8FCqd pIm4Hr23J7YxGzf81gOWcG66KHhn0gcUeTavGfYoOHqwoRYl41qSV1crwdN9DVGGOgH64Y BWmFKEbXXoqsU+0EkYoz06mMfvfFe75iOu15OYqIEaOH6/fJAQW1pF2ZyRpPAdm4etieOb 1g8f1Gg8WG2Yqnw57SYBgmQlBywwD5IQPnd742C57q3Dvtiuta0uUJociPEERlXUgdj15B FEB9gmrlbq+6yYAGWEILMis+sH1Cn1Xmp7s0zcKDuIOrZIJHZqBnhkthqXFZrA== 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 4cj8X00kQ9z2fc; Thu, 09 Oct 2025 12:37:04 +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 599Cb41o072563; Thu, 9 Oct 2025 12:37:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 599Cb3DS072560; Thu, 9 Oct 2025 12:37:03 GMT (envelope-from git) Date: Thu, 9 Oct 2025 12:37:03 GMT Message-Id: <202510091237.599Cb3DS072560@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: 517430d26232 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 517430d262325c58f31310deb01c1a63ea5ef406 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=517430d262325c58f31310deb01c1a63ea5ef406 commit 517430d262325c58f31310deb01c1a63ea5ef406 Author: Cy Schubert AuthorDate: 2022-11-02 05:34:54 +0000 Commit: Cy Schubert CommitDate: 2025-10-09 12:36:57 +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);