From nobody Thu Oct 2 19:06:19 2025 X-Original-To: dev-commits-src-main@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 4cd1VN2jSPz69pM9; Thu, 02 Oct 2025 19:06:20 +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 4cd1VN0HVKz3D5Z; Thu, 02 Oct 2025 19:06:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759431980; 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=xXNQ1HW0iu2faCdkT6+JpivzEKwBO0u7vnbLYg0Ie6k=; b=jhsyp+kAqA3+5ANxe+dyq7DK5y/ViC6t7OsKjhIlTWtEbF16KoADUVKJud5P4lCwgBU3ml SErdJojffOGINfIjvCMtL9h1KGJ0GMdbGVaUdv6lsl1U+P2z9nwRymSXAUxst+4aL2UHIJ gJXrqN6tUMvxvESkkLQ10iL6noJDhdMj+RIP/yeaneyzB3C8/C2W1dJdz5YDDlOgvb7+zI zpSh4KO3u9djuSZ2Z1J+MVyH/+uEBOtIHMoZOAEwNGSs82Lkn84U3s19veX4EyOoZp/KPw H07FLmNlfr+u0sd3YCleOl+aKOalAAujprbg3iXyHCUuUlLQ7BYcWMql71hJaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759431980; 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=xXNQ1HW0iu2faCdkT6+JpivzEKwBO0u7vnbLYg0Ie6k=; b=RiZrE/W4tvqHuaL7WXE3t5JbVbp5hCuNkjXSWnTtRKvtxIcpEQHxrCQntqEIbulzpjP4AD VT8tXH6Yr/Jb3JlCRIDlPsaCAYdHGnlmjLXm+HQHaDkUf2MEo9sllx7XvoD9rsKevOIhcE HBwU6WKObirf0UFQzuWfVcktu3A3tUS3mw9y/4TSyZJnEMKplCg9NCu1QKz4x58F1iA8XM rH2p48BYWEe0/LsLR0MCC9sHFAw8VgtnDPbnv6Tb+wr+qrJfZe5CCDaaI2EQo8jpopADbc JvNWLia6PJBKN+ZDxmckBJAduNGQE1ZTtu+aBhK1aIZuAp/1TL2c2011HNBEqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759431980; a=rsa-sha256; cv=none; b=ncCyGUAesCN17ceVEqJR14YWD4bO+4mzk+ewn5lt71R53NjaXSiYUZs4yHTb70iWhScRMJ 5KR0lE0ZUua8tDbw3Ua4QC42U+3+EG8qz/ePWO5WxABxQBARh+9IZjADGsherHkstULzMy D7gSiZb77glXXIQOfsNYHD6kZGEKmZq6FoH8AdI/cz1o3eBbvirATM3w7akiwsdARy0mhs iJYarNmTSywW4h3nDjBa+Z1ab3N0DrKayuoISFIRZIEJSAFDHbdKumd6P3nxJOM+f33nNu xzAnvU+BMm1FiJd22MA+LxNnYru1k1V+ZLFSXgfmYX1It5R9HQfQciKQBxYoKA== 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 4cd1VM6zCBz4ss; Thu, 02 Oct 2025 19:06:19 +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 592J6JGh078789; Thu, 2 Oct 2025 19:06:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 592J6JXp078786; Thu, 2 Oct 2025 19:06:19 GMT (envelope-from git) Date: Thu, 2 Oct 2025 19:06:19 GMT Message-Id: <202510021906.592J6JXp078786@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Cy Schubert Subject: git: eee36ffa0d87 - main - ipfilter/ippool: Dump a copy of ippool dstlist data in "new" format List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: eee36ffa0d874f1c8aca912f7c2a8eba34509927 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=eee36ffa0d874f1c8aca912f7c2a8eba34509927 commit eee36ffa0d874f1c8aca912f7c2a8eba34509927 Author: Cy Schubert AuthorDate: 2023-03-01 03:18:07 +0000 Commit: Cy Schubert CommitDate: 2025-10-02 19:03:35 +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 --- 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 ");