From nobody Thu Oct 9 12:36:27 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 4cj8WH5gwZz6Brvm; Thu, 09 Oct 2025 12:36:27 +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 4cj8WH4nyHz3YGW; Thu, 09 Oct 2025 12:36:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760013387; 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=XvjzjG8YxUiNb9bBM5AqmRTbI14h1kzPrrTVBLglFEM=; b=PaCEdJxiGiehjLynXC7ROhMNlZbOYsXqEfH8GewSLM2tCvT5uaqagJRRloRxcOnJSRQe+i CtNHwfp2zOvGyOrA2rCKtl2C+V99KRACpObdOE0yu4lItwwffHXsZqdrdvlBGFIBuP8b+M UlThSiNvgDOzUi23pOLHPueI3XB0lcQ615ePAaby7AhwkMe1Y9vjjxVzytlj9aQI/4EEJE ayg7QdurxNOAdFeGrMYqDASyew8C7aK8HOUt7jhFneNV6e8F6svwLdWqDecIor0qW7PJ5O UEzBljnl3mh53vJnkiRzM0UpF1BA9weSgkt2gB5oq0eXqcRZxnkY2D6UR4g/PA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760013387; 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=XvjzjG8YxUiNb9bBM5AqmRTbI14h1kzPrrTVBLglFEM=; b=RcCgsv5zumcYgCzciWo4oq/ed+XgAB5/14h08/iR32Z//nLCw3uBaIqaH/jIcV5eb5pADp XGmJitWBzZ2/M/FkY26AB8dXylviOTpNDT1DlWvlGJXEcWj4KIpkQpvQu3UUGMLXP1hUCb 0OqJyLMZt3tOAetJJWsV1OqXMqvy5HwTjOD4d9BB72AZUljXTYyNxDcfp05y8phF2gVHRR HzFxFckmNH61KZBIvZuP78xsYjT/kBNZx0T/0EGTNoKuII6RhO1IlNmGJU80g5cabNZ+2o MyPB1SR1i0bOyM+YKVMSCKG0kELY4RQRlkyZlZ4FyQjEOUn1LA/ijNcCqFhiKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760013387; a=rsa-sha256; cv=none; b=UFCCbYZT2MT2AFruqMIPs+R7u/Ri4HBUo4dsz9cxVkxAdCGP5jahNcbRAKPaq7UuDwqW5s 4ox75HQO7qFkRCsAO48/oZ3/x1yo0S6fNwlGR7SQloqtZRX0+acv/8bj9VRqA7B67Dq3Pu syGPaVXyddJyhxYZJbI21pHXi2CTS4HIhj47Zeo1qvVn6+lMf4uytQRUQfm9a3bBamezKU FntlSPSGvouj85Wg5DF1Cts85fWIOK3dF/G5CrEsnr1ZPTCdMUHCQld28FA1yLu0wRqVpX wHD1z6AyOSzXSdL7XB895cxqmlenLG45ynTzEwlZ75wy0bIw2Ns5oPqb/GlMdQ== 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 4cj8WH4HZGz2F3; Thu, 09 Oct 2025 12:36:27 +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 599CaRYA071891; Thu, 9 Oct 2025 12:36:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 599CaR5k071888; Thu, 9 Oct 2025 12:36:27 GMT (envelope-from git) Date: Thu, 9 Oct 2025 12:36:27 GMT Message-Id: <202510091236.599CaR5k071888@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: c50efdbe4aa4 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: c50efdbe4aa4b8afebdf8afe0893185203a43bb4 Auto-Submitted: auto-generated The branch stable/15 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=c50efdbe4aa4b8afebdf8afe0893185203a43bb4 commit c50efdbe4aa4b8afebdf8afe0893185203a43bb4 Author: Cy Schubert AuthorDate: 2022-11-02 05:34:54 +0000 Commit: Cy Schubert CommitDate: 2025-10-09 12:36:20 +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);