From nobody Thu Oct 9 12:37:06 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 4cj8X25V8Dz6BrPl; Thu, 09 Oct 2025 12:37:06 +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 4cj8X236Zlz3Zqm; Thu, 09 Oct 2025 12:37:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760013426; 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=y+F5nFY1SyR26aiwqhztI0vqPQOIw3o+J8jvGmMSd1w=; b=ET4a/Xz0Jdmp6nznHKkPaaRbD2ZXAkRp03gPbEBOtHvICQ5apYXYkF/MYe4qbFPaFV53ab l8EumBxeWe2TijYIeIJ2ZRyMxagtMmYpqBOgX5wTNBzu5kYfB4pk6IZ5/f/OXWGbHCf9hp 7QeGo32uKm4uynKb5hbuzsErt4UVRdLQYxIZqFkUwZ0FHCDZEJ6fDXCMOkRv4IGAp5w3xp aZIApw2iUQVCmlYaqEYO6dN61LO2GiJ/cf70Dd2r8FmUCNj8oxIvzlNj1yof1639Y0nC2g vsduy+zxcY22WVpWc5XLZtr4DCTQVYuI1Q6qFpyi+JRfrxmtlQoFI0DipJquMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760013426; 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=y+F5nFY1SyR26aiwqhztI0vqPQOIw3o+J8jvGmMSd1w=; b=oGrt4h7DaTzEkOLQxrcIfKCk3YgrK0lFCKV+jDl3ZQeVe2l5agcndfQSTX4+JjvuA0jwc/ 7oH8oVib7ChohBdlcgur78sIogGgspRVIhyX2SplJL21nSdtR52x95F6LeCqcsC2R2Bw8B g2GI1gpGnXBLMINdp+0RiJs1xanjGOLXQ7xntw6KDbAsdrVbY64jDsFZ1ravwMO7xlhhGG hMKySid3bX/oPGfg1vT+zKBr09wib4xg1t21z0eRSA7AWuCFM9iPueVypPKbkIgBdhRyiR ZG0f2frifKn1Qzn7/UzsMCMZpzewMsopKNIYlnu0tuoySJ2XmFyUZE/piqfeog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760013426; a=rsa-sha256; cv=none; b=x9xkF3ahR6AE985t1OwTpNn9SkfNP3RTuEuGnJkPdstC50/SjWJXWtAqYJDUWN/EHBLwHn 9e3Q6oCOVR8JsMJ1V+x7L9aDajl3097R4dswI8hOxxSTzMbUD3dG30e25D6Mv4ByUBUOg+ VTS3nc393fWlTBb4Ui4aYb3WRwH8YqA0B1WTJ2PMPcaQu0JBknID3mEPHpC4Ah2896ofED SMeSeLhTwI3O8dzuXdmKbRMG7m5UaFOvlSepE5eSUBxad4rlB6j509jO6ChS6gqN1VCspv AoR+Z4kkiKYySZlTq6hR3qz8ACAK0u8UuZdwz4nM65m2lDqEIFqzsKvjDdLgIw== 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 4cj8X22cwZz2c1; Thu, 09 Oct 2025 12:37:06 +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 599Cb6gQ072629; Thu, 9 Oct 2025 12:37:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 599Cb6uk072626; Thu, 9 Oct 2025 12:37:06 GMT (envelope-from git) Date: Thu, 9 Oct 2025 12:37:06 GMT Message-Id: <202510091237.599Cb6uk072626@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: cccbbb329980 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: cccbbb329980e7fa9d625822be637a5faed136a9 Auto-Submitted: auto-generated The branch stable/13 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=cccbbb329980e7fa9d625822be637a5faed136a9 commit cccbbb329980e7fa9d625822be637a5faed136a9 Author: Cy Schubert AuthorDate: 2023-03-01 03:18:07 +0000 Commit: Cy Schubert CommitDate: 2025-10-09 12:36:57 +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. MFC after: 1 week (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 ");