From nobody Mon Nov 16 18:47:31 2026 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 4jSxgS0Gb5z70YwL for ; Mon, 16 Nov 2026 18:47: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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jSxgR6QGsz4PgW for ; Mon, 16 Nov 2026 18:47:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794854851; 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=4PCvj/92JBOPYdVR+K0E6+mAkrx6VwadD4W4prsc7/I=; b=VF7/mD78JQv8xuYJTny4mQyCEUdUWBD0SFjy/hyvTWc9y1gfyMcOdZVDxvbnlduRxynNFG fBxRf7rT21ttaSlyqnO0P+jw8bTOOnkwaFkhMozbMd7506bEGyO/WLPeUO3voiTQwlSvhr Ql41K6q5f26pcdbFKZZb4xw9vi11cSeSZeNKoQdGaUXv6wDAX8nS7mxs2uFK6CslfIIILX J3cGDcJmSwR8ZW1Gr9ZT7RfETB7OieTWI4iqwdpY9sKM900Htak/DIjlXLCw89zsGbfd7T eScjQ1f+ZqBmJdB7lbQfmq1/FQFgqN4MENGoyjMSEXBdqMyK75OiP0lOwn5A8g== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794854851; b=UfIbMaA5CH+ik8df5zaYNAdmbMxu6wpovOxFc5rp14iKgLuY/TqyVelPtrD9AfJ4HhBzzn tV0KEMHU9SLxUsw09bUxLSbSCcEn+P0E6Va6DmHjAvBQJ08cqsttLLQNVjuWbD5tsVicsJ iXKG25V4P4HDsJzbiAFZcKFwabn5+eT+FGLeuNcI54iRok4Atp+pQKzWOW2XHjzeSJPGK8 SDsaZrClok9GAGCsCVj/ueebjFIuQCctTEx4+Pjqx0nipLprUcbamjKIKCCj67SSdxfe2v vJ3Rk1Ne19sZa4I/jy64rz76LLjHCpgr4sF7ZWdha3KwxbVleXLcfzhTxgiWjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794854851; 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=4PCvj/92JBOPYdVR+K0E6+mAkrx6VwadD4W4prsc7/I=; b=J6qmANq5TlyRj3q60RPCDTu+ZDTkme6BsXa+yaYMYu8PNJi3upTBeDNaROnS4KWYYzASh7 q89sxWFycMfBKTIBVeSsm7AaBa2kJ3nXvDfAFIzvPcUe1YdUDKTyBTuymt+mLU5osfoswJ N+HGtP4SXPmvXzUG71ON5qXjkgHAfJ5HiX+9ang/ExlUGRVLiYoLBvGBMcDgI5mksHuNzk rt2X0QMp61zQ/B7wRNiFA1jz1Y4BO9wpee7cUJVoLQzRT+KU4w4WUlb2zA8m1KC/ZXdQkt WViebuZasYxfOvjBLiy/Mf1hn8ccGFopBIgJuc+oxnNW08lp7zYfFEXOHFQe0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jSxgR5nXWz163j for ; Mon, 16 Nov 2026 18:47:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a6a2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 16 Nov 2026 18:47:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Maxim Konovalov Subject: git: 611046b15dbb - main - ipfw: print the log, not the config, for "nat show log" List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 611046b15dbb92226c346cfbd61dffb4b402b4f6 Auto-Submitted: auto-generated Date: Mon, 16 Nov 2026 18:47:31 +0000 Message-Id: <6afb4fc3.1a6a2.3918bc76@gitrepo.freebsd.org> The branch main has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=611046b15dbb92226c346cfbd61dffb4b402b4f6 commit 611046b15dbb92226c346cfbd61dffb4b402b4f6 Author: Maxim Konovalov AuthorDate: 2026-11-14 13:25:45 +0000 Commit: Maxim Konovalov CommitDate: 2026-11-16 18:43:53 +0000 ipfw: print the log, not the config, for "nat show log" Add a test too. Reviewed by: ae Fixes: d6164b77f8b7 ("Make ipfw_nat module use IP_FW3 codes.") Found with: Claude Opus 4.8 MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D61588 --- sbin/ipfw/nat.c | 5 +++- tests/sys/netpfil/ipfw/Makefile | 1 + tests/sys/netpfil/ipfw/nat.sh | 66 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-) diff --git a/sbin/ipfw/nat.c b/sbin/ipfw/nat.c index a5691200943c..df9e51a58e4d 100644 --- a/sbin/ipfw/nat.c +++ b/sbin/ipfw/nat.c @@ -1192,7 +1192,10 @@ ipfw_show_nat(int ac, char **av) } else { if (nat_get_cmd(name, cmd, &oh) != 0) err(EX_OSERR, "Error getting nat %s instance info", name); - nat_show_cfg((struct nat44_cfg_nat *)(oh + 1), NULL); + if (cmd == IP_FW_NAT44_XGETLOG) + nat_show_log((struct nat44_cfg_nat *)(oh + 1), NULL); + else + nat_show_cfg((struct nat44_cfg_nat *)(oh + 1), NULL); free(oh); } } diff --git a/tests/sys/netpfil/ipfw/Makefile b/tests/sys/netpfil/ipfw/Makefile index 131e67b1bd5a..d45e63bd6195 100644 --- a/tests/sys/netpfil/ipfw/Makefile +++ b/tests/sys/netpfil/ipfw/Makefile @@ -7,6 +7,7 @@ ATF_TESTS_SH+= fwd \ ipv6-flow-id \ log \ lookup \ + nat \ table \ unmapped diff --git a/tests/sys/netpfil/ipfw/nat.sh b/tests/sys/netpfil/ipfw/nat.sh new file mode 100644 index 000000000000..c3e29def0ffe --- /dev/null +++ b/tests/sys/netpfil/ipfw/nat.sh @@ -0,0 +1,66 @@ +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2026 Maxim Konovalov +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. + +. $(atf_get_srcdir)/../common/utils.subr + +atf_test_case "show_log" "cleanup" +show_log_head() +{ + atf_set descr \ + 'ipfw nat show log uses the log formatter, not the config one' + atf_set require.user root +} + +show_log_body() +{ + firewall_init "ipfw" + nat_init "ipfw" + + jname="ipfw_nat_show_log" + vnet_mkjail ${jname} + + # A nat instance with logging enabled but no traffic: its log + # buffer is empty. + jexec ${jname} ipfw nat 123 config ip 192.0.2.1 log + + # "show config" of a single instance prints its configuration. + atf_check -o match:"ipfw nat 123 config" \ + jexec ${jname} ipfw nat 123 show config + + # "show log" of an empty log prints nothing. Before the fix the + # single-instance path ignored the command and used the config + # formatter, so it printed the config line here instead. + atf_check -o empty jexec ${jname} ipfw nat 123 show log +} + +show_log_cleanup() +{ + firewall_cleanup "ipfw" +} + +atf_init_test_cases() +{ + atf_add_test_case "show_log" +}