From nobody Sun Aug 10 05:55:32 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 4c06SN713Qz63sZK; Sun, 10 Aug 2025 05:55:32 +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 4c06SN5y3pz3PrJ; Sun, 10 Aug 2025 05:55:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754805332; 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=kM6RtrnHk80LkHVyjXaBDUBgv7ncGXwDtURlFLO5GjA=; b=txKY1xIJCmSKWknskqXcyB3jVI4PsivdRgyszb6nnZXo8WFALDlH551eURVgl2pmZ0plZH y2UKO4ETvH2K1YCoVQ3f/7McAg3r70VthehVOash5iy1VhtxcIpBZhRwDmEipxCqx9Z1qB gXHdNRl2R8FSSTerlL3m0tlzKX7+qxplRB+I131MlplqE3BgzrALTyx3gjSCNCKWs1saZy chTejJ+LLOfUJ5wdDKreY1ky43k+icSkzxQtHVp5SffNqKapBI3BXw9APQqd9pAi854YO6 kMNaNsSufxWxiyN1LMs8XSqjmIq6eaXQ8PYEjW0m4KjB6ysBDwHX4OMgo+IaXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754805332; 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=kM6RtrnHk80LkHVyjXaBDUBgv7ncGXwDtURlFLO5GjA=; b=Y7uDw462N4tUFN2CWJAWDzomR3DyJ9k+fd9CGFBp/n9l5EDDz4PyILR9p/EeY/Xz2HtfYw D5l39oEaYSjCZ7vh2rTcpMKDzJ8bUfgS9oQ4NcYLVRGrsaXfkiJqv5rf+Ti1omee0w7MY6 qHAZpIDtYuWozsZDNQXNCu8V0d/isxJ0fxAcpowUyeQkzE00A+oIMCSTuCuisxIJl4VoMq deg0qVaUAshmXwPP0fp/LbB0O/sK1xTUbJGOR0kcic/LslO15ivzRvQg4UiCs5P74xWPlf CdPxG3tM+BnMUSBOKzGkcmmCSTPIV2d2U+ieJQiCqCGZpo4ywT0dULs7LnUWhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754805332; a=rsa-sha256; cv=none; b=VCCYP87xl7kryOGngg8Ye/82WqqrVDWNjV/LyN9c1PJV5PEU4iqx97JEhsVtx+5KBAAmyp qALUh4LBFok1gL9vqr5fk0UozJ8/Mt43HPGRlvrb6SDuGCc1RZNLsMHPkFTLWwFsiYIMF3 MPzM1Imab8Lb7vaIwXGM20t+xLErmR8bWHioDpuW+UO1M134W8ek8kPORnYnKgPxQf+cBZ Y7FF8tDxtwIIcxMd1EvWZIXbU/r66woRPkN5Z4uK1AALJBQ5H3gfcZuT1szL6sFME3PxFx V4by58f1uktAb5oYpc245tsP0MZzc5Mg0/dbD+exAIvuqEYrDxhBGgUl+uZ0MA== 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 4c06SN5Nfwztrw; Sun, 10 Aug 2025 05:55:32 +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 57A5tWPA077568; Sun, 10 Aug 2025 05:55:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57A5tWHl077565; Sun, 10 Aug 2025 05:55:32 GMT (envelope-from git) Date: Sun, 10 Aug 2025 05:55:32 GMT Message-Id: <202508100555.57A5tWHl077565@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: 597601a23d5d - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 597601a23d5de22dc6d25dad0f7d7ee054e60b08 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=597601a23d5de22dc6d25dad0f7d7ee054e60b08 commit 597601a23d5de22dc6d25dad0f7d7ee054e60b08 Author: Cy Schubert AuthorDate: 2025-07-07 23:37:07 +0000 Commit: Cy Schubert CommitDate: 2025-08-10 05:55:14 +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); }