From nobody Sun Aug 10 05:24:44 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 4c05ms07CFz63pNV; Sun, 10 Aug 2025 05:24:45 +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 4c05mr6RYmz3JJn; Sun, 10 Aug 2025 05:24:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754803484; 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=G1ZTgiFqrd0Fw3sVWtaMdCZiAlt8jmd989wMoCLqbME=; b=ttBbQYhYpUaFqx1lBzAq0kqcAFtj2ko9V0O6C7URtzRrlTSSUbPdrS+w79aD42GI8Vyuro lo4678Fq7khKZteqqSMVgFC03UL2JJskx3VeuQaLTTtH3YhnfHym0XNp4ArgoVIYQ/wjqE 2nvH6uRVB1eyz6GfSwZQlsKQYOJ/LrfPTIp5ZIrudwd5tTohRmqMSQ+KvYAPCDb9FTmtUi SQXFb6/trwl0YUiPEoTj3Sz66Vd0PpavYCHD8EZmIzjDFHJzrsvD5tT2HZmOyKRWrWUiRL SCs0mOaJb9+netKPihCYQNSSc1uInVEvap23Zs3YDeVHrjWMxy7YlA80B4E6tA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754803484; 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=G1ZTgiFqrd0Fw3sVWtaMdCZiAlt8jmd989wMoCLqbME=; b=eGBaMJm06YTYBQLpyBCpJGwnT2iPBQ6rHwprsAfkthqGlFy1N/Q7RkTBWix4GmmmaOZdKl EpWMsWDcHiBeMdVMD2PCTtceX9t//0c0GJRKlfbgmaxIQtWpzqQn1vLgFufnftZB2X9BDA B4JaGR80MLQYlJLZ15jueLerdvcVW+c5/Xu8xCv6Fs/uB3FADPymCBsJrb4uW1q6D7m/Ni QFLc4YUo4n8+PwPXbRu09nMHlYszcDJmY+IezPZVjRfJ8diJM4cJiKX+ntQYctjUSFt6mK DFDSRk+DZMj/YVVEzx80tFY5f13HpmMtU9IZsjTlkRgvC+bga9R0Lp/cyeys+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754803484; a=rsa-sha256; cv=none; b=NGT2N7aI15hHnvDcwGt4VknnEdQpfnNaRMXkc4YIRjT/t6BgZ4wTUijj4SkIfqtmVUVLp4 gvHhFxumqtyLudw/jK46u/K4FyOsjmLPyuscLXahX8zYaB7PYF3R+M9C+r1Fkb3j9BOn2v enhuvFyw0OoPya5cuJMiBGDa7+b53ZoD3z/k6lzzbbyoahLAUnuXdn2TPX26Qm+Xz7KRto wSQ1Rnv9G36kKlIL1w3skfKF4XGTmdCDUNMrQjraS24A3RiI6pbvC9oVKUCTXvdeNISyjy mNAHNFzg4aB5YSwK5hFdnXwoKIx7iZnObQxunhwds3CyorWd5tb68T033pCpVg== 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 4c05mr62TRztVM; Sun, 10 Aug 2025 05:24:44 +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 57A5Oisd020546; Sun, 10 Aug 2025 05:24:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57A5Oi3M020543; Sun, 10 Aug 2025 05:24:44 GMT (envelope-from git) Date: Sun, 10 Aug 2025 05:24:44 GMT Message-Id: <202508100524.57A5Oi3M020543@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: 389e57881be8 - stable/14 - ipfilter: End (cleanup) the iterative search key 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: 389e57881be84106e3036ef1b205a17826fb33dc Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=389e57881be84106e3036ef1b205a17826fb33dc commit 389e57881be84106e3036ef1b205a17826fb33dc Author: Cy Schubert AuthorDate: 2025-07-07 23:37:07 +0000 Commit: Cy Schubert CommitDate: 2025-08-10 05:23:57 +0000 ipfilter: End (cleanup) the iterative search key This results in not finding nodes in subsequent hash table listings. MFC after: 3 days (cherry picked from commit ac2e39b5ddf5d5c6bc3848e392670a00e5834450) --- sbin/ipf/libipf/printhash_live.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sbin/ipf/libipf/printhash_live.c b/sbin/ipf/libipf/printhash_live.c index 3caaa5e022fe..b8ee31b27597 100644 --- a/sbin/ipf/libipf/printhash_live.c +++ b/sbin/ipf/libipf/printhash_live.c @@ -61,5 +61,8 @@ printhash_live(iphtable_t *hp, int fd, char *name, int opts, wordtab_t *fields) if ((opts & OPT_DEBUG) == 0) PRINTF(" };\n"); + + (void) ioctl(fd,SIOCIPFDELTOK, &iter.ili_key); + return (hp->iph_next); }