From nobody Thu Oct 9 12:36:48 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 4cj8Wj18CXz6Bry3; Thu, 09 Oct 2025 12:36:49 +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 4cj8Wh4H52z3ZD9; Thu, 09 Oct 2025 12:36:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760013408; 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=Y10Y9s9KLNm9HxxXD/9Pf4ElZaVVMSCyvMMEJpew4UE=; b=LbJ8lAXlIJIspjpf2bbeWzWJgS64uNeBhy9wFWxaTdiyVsqYMmA6GLsHsbXNQrkBzxKQ0o rqqiPEtbKh+yYOGO4b9N54N85Unr8lyrjOXrcek5TFJVyKYjLVPttLtyraiZAKJp3/+M80 qtUJU6tkywW6G9XwbsqKHbmO1183GXLg25niLmtM8zLONyqJt2T3hagTAdBRJWzfJwiIU6 1PBxc5MrA1hHZncsnXl1rZEsAzYnhZZMbKtZnqGm23ow62ShXch60K7PxwhxL0+uj+k5Bx SUNU1L4pjNW40dmkgL6fTQxX5pIRAiA2sUa/OJK6UTI5CxpHT8v6HIGvcKZR+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760013408; 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=Y10Y9s9KLNm9HxxXD/9Pf4ElZaVVMSCyvMMEJpew4UE=; b=GlMzklH1Uqsl8gc7Qq4m+ugz+kUeW2VpF/RiMYP02bbro2Yq/rGhsUnDq3kvLH+sjR88rK l22WWU6OLt+GoC0E8xWblVscFDqy8LZysbB4ZJ8egfSpCsMrSeffA4xTNYvvQqpszw9DU3 U7ASfwTF81dnyFdnQpWQbFdNrRbAvmEnguq/HsUMHuQ0FYx8Pwg4bF+Bg6uGPFXY/OPFiT 3dyXQ9QoDmN6DLhTOpyQeq6Xn0KK6SC6RiyNw18v+/chZKXNImopbOZvzx8BtJRNuuxfwJ ueya3he2llKgOwH3d/O84G6x/tfrtVGDisbDLgpRO52HG3VSuJXSLAfZR4Cq0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760013408; a=rsa-sha256; cv=none; b=x6ak14qD+MCUtIhWF2JulMsb9+S0fXHgqar/4q42mUnyHHZWMABSOZvsPfgT7iUJmCypQP OLaiFwvWeypC3MdhcaJL7KoHOgEyWhiDPoGBNje2vwtsSCs+U1XFFIQ1YxvE2Wpm8ej4Xq +p1bQWyfLcGegS1Ol9gf9DEEuPw7BVBxWJl0omS0vIdu5xNGqhJ9/xy5VtQ76FSAZAYkKK DXP8gxhUKhBTsJtEMB/r70bcUC07R2KAN/KgAbh/Mgoe3msw/ltLKZyMuzv41ZBIt3r8fj 2zMhwnlT8uvaDnykB/9AX7HVN219V/XWGzn0COf7hjoc7EongOCashBENN4zaQ== 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 4cj8Wh3Wr1z2hy; Thu, 09 Oct 2025 12:36:48 +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 599CamJr072295; Thu, 9 Oct 2025 12:36:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 599CamoP072292; Thu, 9 Oct 2025 12:36:48 GMT (envelope-from git) Date: Thu, 9 Oct 2025 12:36:48 GMT Message-Id: <202510091236.599CamoP072292@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: 12ee292aaee2 - stable/14 - ipfilter/ippool: Dump a copy of ippool dstlist data in "new" format 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: 12ee292aaee20d190125d58d73da80907435ea03 Auto-Submitted: auto-generated The branch stable/14 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=12ee292aaee20d190125d58d73da80907435ea03 commit 12ee292aaee20d190125d58d73da80907435ea03 Author: Cy Schubert AuthorDate: 2023-03-01 03:18:07 +0000 Commit: Cy Schubert CommitDate: 2025-10-09 12:36:40 +0000 ipfilter/ippool: Dump a copy of ippool dstlist data in "new" format As with 7531c434a593, which dumped ippool table data in the "new" format, print dstlist data in the "new" format. (cherry picked from commit eee36ffa0d874f1c8aca912f7c2a8eba34509927) --- sbin/ipf/libipf/printdstl_live.c | 3 +++ sbin/ipf/libipf/printdstlist.c | 2 ++ sbin/ipf/libipf/printdstlistdata.c | 5 ++--- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sbin/ipf/libipf/printdstl_live.c b/sbin/ipf/libipf/printdstl_live.c index 088448e6656d..72cb75a832c9 100644 --- a/sbin/ipf/libipf/printdstl_live.c +++ b/sbin/ipf/libipf/printdstl_live.c @@ -40,6 +40,9 @@ printdstl_live( ippool_dst_t *d, int fd, char *name, int opts, if ((d->ipld_flags & IPHASH_DELETE) != 0) PRINTF("# "); + if (opts & OPT_SAVEOUT) + PRINTF("{\n"); + if ((opts & OPT_DEBUG) == 0) PRINTF("\t{"); diff --git a/sbin/ipf/libipf/printdstlist.c b/sbin/ipf/libipf/printdstlist.c index 2cf41ffe414c..497d7004c94c 100644 --- a/sbin/ipf/libipf/printdstlist.c +++ b/sbin/ipf/libipf/printdstlist.c @@ -42,6 +42,8 @@ printdstlist( ippool_dst_t *pp, copyfunc_t copyfunc, char *name, int opts, return (NULL); } + if (opts & OPT_SAVEOUT) + PRINTF("\t"); node = printdstlistnode(n, bcopywrap, opts, fields); free(n); diff --git a/sbin/ipf/libipf/printdstlistdata.c b/sbin/ipf/libipf/printdstlistdata.c index 7940d2ae021b..546bf35cabf6 100644 --- a/sbin/ipf/libipf/printdstlistdata.c +++ b/sbin/ipf/libipf/printdstlistdata.c @@ -11,8 +11,7 @@ void printdstlistdata( ippool_dst_t *pool, int opts) { - - if ((opts & OPT_DEBUG) == 0) { + if ((opts & OPT_DEBUG) == 0 || opts & OPT_SAVEOUT) { if ((pool->ipld_flags & IPDST_DELETE) != 0) PRINTF("# "); PRINTF("pool "); @@ -24,7 +23,7 @@ printdstlistdata( ippool_dst_t *pool, int opts) printunit(pool->ipld_unit); - if ((opts & OPT_DEBUG) == 0) { + if ((opts & OPT_DEBUG) == 0 || opts & OPT_SAVEOUT) { PRINTF("/dstlist (name %s;", pool->ipld_name); if (pool->ipld_policy != IPLDP_NONE) { PRINTF(" policy ");