From nobody Thu Oct 9 12:36:29 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 4cj8WL0VrYz6Brvq; Thu, 09 Oct 2025 12:36:30 +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 4cj8WK6CRZz3YKY; Thu, 09 Oct 2025 12:36:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760013389; 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=qxtYp7kOklLen2gDbhnaGjbVIQYOSi0+fRQXVHHFjRw=; b=Cc59EBBNka3zoFHEWm/GPW4yAm40dhzj09L8AMkg+PcUitiRpVz8Mcl21DKU7yzp2pUUtr HS6fIHixgYNtrXqQ8gshsT4Gb7muJF+InTuEUkaoKdFewI4MO03gF3BnzeDi/j+qASAmlr 6nDgmZ66su7ich0uci8YhbBhh0gYNQXWLT1cRVT5hRjKVQadswgfLgcaj+XQJVmNjFLO9x njRZGD4if7Tj5xt+Jmn+JkSbJBjCgJxON/hxGvG+9nkbBYGHOedG0FUv9spfDx4g0ChziZ 3XKXZ1MKXgTaSRX8z7hWcQ4JfX+ejl9n2O6UpolyUwAaCQ42VEsROXhvP63Y6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760013389; 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=qxtYp7kOklLen2gDbhnaGjbVIQYOSi0+fRQXVHHFjRw=; b=IV3+R3Ytabxj79y4GOsQh+4kAda6X1mZmt/LuDDOJqNtBwf44l3reR7KKBJW7uuGYRHqPt +LfYHHF/SztVgnWPmQgzk1Ha12WJpjdzDsd9ziZd6X5qFtDwW8hlIE9qPddKqRWlAb96Tc 4Foz2XRAR4uJBrv+lJL/WY5OAUQADGCw92glLvnYnrmQ36e4ugOzob2BTOqXcsXC37CzXY +3l053ias2keYES24BIaUbPjNLtdlZ2l6Cb76y8+NCpd9YS+Hc1y/wzJ3Wmx1gY7SeVZh/ T6/zIKDO9Gzydco2pPmXW9Y/CPLbDM1odwqkqCDb7ahb/RjiDFaNzefzpWI1jg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760013389; a=rsa-sha256; cv=none; b=YSQsKG4Ct3hBuDVRSkiJLPcOlKZsauxK6ROM4okHl7DAvelYON+wB4Q3V/KTB7iwbpbzYs Yw1ozAnva2m5O1ZCPTi4MT4+LxfFCGj4Fk4GSc3KgyuSYBCfNlfJHyM6TGN0z91BxZtf/R b5+xDdOXtaIP5efkv0cLFzb6oIFmRWH59DpXNxgn7L//Yd93jFK/BCjgeZe7/9lsjKBY3t /RXDV9a/QFry4LDHXCMF3uG7bJE4KxQeCGsRbxadKXrHLSLdOtWEg7tzfRSZ71HXpqGXXx 1k53Kch+aId84Jg4vvVoMnlEm7p7b/vz24JLpY/cf5BW3+/R2J6Vh7yMl2b9BQ== 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 4cj8WK5XCpz2c0; Thu, 09 Oct 2025 12:36:29 +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 599CaTiV071964; Thu, 9 Oct 2025 12:36:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 599CaT23071961; Thu, 9 Oct 2025 12:36:29 GMT (envelope-from git) Date: Thu, 9 Oct 2025 12:36:29 GMT Message-Id: <202510091236.599CaT23071961@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: 756a5282b3b6 - stable/15 - 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/15 X-Git-Reftype: branch X-Git-Commit: 756a5282b3b604e5babc277f5e3cb8b7d8a2d7fa Auto-Submitted: auto-generated The branch stable/15 has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=756a5282b3b604e5babc277f5e3cb8b7d8a2d7fa commit 756a5282b3b604e5babc277f5e3cb8b7d8a2d7fa Author: Cy Schubert AuthorDate: 2023-03-01 03:18:07 +0000 Commit: Cy Schubert CommitDate: 2025-10-09 12:36:20 +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 ");