From nobody Tue Mar 15 15:20:10 2022 X-Original-To: dev-commits-src-branches@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 09A4B1A1943B; Tue, 15 Mar 2022 15:20:11 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KHxt24MLtz4Zrr; Tue, 15 Mar 2022 15:20:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647357610; 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=BgFGqV0T+gPaheKEndUFPCqPibDysgwqexQU2UXiE4w=; b=iStTEK+7UBeA0HMfM/8iDWIPEby9O5b7X+7uSP+HzNGQBlQlnWJJhF+fdZHAxuG5YPPzBy NaLJGJdtzJ31goBYbcKpY6XaJcNSArEXWDG2udGPbwUjlQxXLtsJ8UtUMlU3qCp/gvSjf9 pODORhuH7qnkbXrFAvZAegHQJl7T7ckg9o+tchRfnsX3VU5nOzVNOXBVMY241nZUtUCu/l IaR3piTexzS6V7szKEIYW0oDQ/7wiIiioXDNYz0iNameHaP/zjT8jxQv4UWyv8k+SX9veo S3wHtUBWn4ZGRRGRjK1WDESARL0UfTb5LdxbpznpAKZueBrwyq5wdEGHPM75Pw== 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 68C8023E5E; Tue, 15 Mar 2022 15:20:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22FFKAW7033568; Tue, 15 Mar 2022 15:20:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22FFKA0h033566; Tue, 15 Mar 2022 15:20:10 GMT (envelope-from git) Date: Tue, 15 Mar 2022 15:20:10 GMT Message-Id: <202203151520.22FFKA0h033566@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kristof Provost Subject: git: f1a4505ee00b - stable/12 - pfctl: support recursive printing of nat rules List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: f1a4505ee00b570fb7f5901adfcac490fcf74f7b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647357610; 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=BgFGqV0T+gPaheKEndUFPCqPibDysgwqexQU2UXiE4w=; b=Ygnm2iB8BENBRKgA8sB5haOvM6mRVq3zZ102kpNlMpKRsZ93tSasj8ktcsE8YuTeqbpUJa wKSn3NJrBsOOArFt2UK9Jsh3v+ZiPXgyupOtVKY+Y2t1rdc71KSE1Rs31kTIdnRQDGAHvL FF9/oUU8dFeEYp2+2y3GePWoBBhC4I1uqrtmDe/E61ubLHSwotjsrIAEvSd0B/ttwJmNSR VjVepiB55e8+LQycz34ijoQ/FWgx8j797wyzw7IlvlTvGzO4vv6+GYqk74jPZ4dk6RYG38 gvdK0DdYa4wCTJjUWYMf+qXVx8FBbTWVxm9qhreVFZ8ShVlz8ATteV7SKIcgWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647357610; a=rsa-sha256; cv=none; b=kQ1mAhnrRwfTbyZGixJ38ROJajJ6rM5b078Lqc6YFD8z5V4A3GklwlaEDs2oLlaRvIwMBz g37bes0RgrSJ+r0tB9SSGduxsNdq2VBP5pdCEAIB+9TlTU1lYrGu0l2pbn+evY4+GWiGKy x/JmO1TYG4INYOch6Oqr9ZiPG8L4yuvMvSM175SdpbOXLs1x3d4eDZwtIBn7rE+cTQN8bk apUgVjfaPtfW7PsqFJuQEgNO5kWzR4mW5jXhe0ywMVszpMDYiWZVPiiVl0XSGO3wmxLN9O BBWurlyds4pIvCH83upClaE72oKlYz/y426OruoeO6PgSt3UZH4sz6bY76409Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=f1a4505ee00b570fb7f5901adfcac490fcf74f7b commit f1a4505ee00b570fb7f5901adfcac490fcf74f7b Author: Kristof Provost AuthorDate: 2022-03-05 16:55:48 +0000 Commit: Kristof Provost CommitDate: 2022-03-15 02:52:37 +0000 pfctl: support recursive printing of nat rules PR: 252617 MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D34455 (cherry picked from commit a20773c810814dd130ca1f0fbf08d27fea465555) --- sbin/pfctl/pfctl.c | 41 ++++++++++++++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 7 deletions(-) diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index a0eec1b09289..342f355a0116 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -98,7 +98,7 @@ int pfctl_get_pool(int, struct pfctl_pool *, u_int32_t, u_int32_t, int, char *); void pfctl_print_rule_counters(struct pfctl_rule *, int); int pfctl_show_rules(int, char *, int, enum pfctl_show, char *, int); -int pfctl_show_nat(int, int, char *); +int pfctl_show_nat(int, char *, int, char *, int); int pfctl_show_src_nodes(int, int); int pfctl_show_states(int, const char *, int); int pfctl_show_status(int, int); @@ -1191,17 +1191,19 @@ pfctl_show_rules(int dev, char *path, int opts, enum pfctl_show format, } int -pfctl_show_nat(int dev, int opts, char *anchorname) +pfctl_show_nat(int dev, char *path, int opts, char *anchorname, int depth) { struct pfioc_rule pr; struct pfctl_rule rule; u_int32_t mnr, nr; static int nattype[3] = { PF_NAT, PF_RDR, PF_BINAT }; int i, dotitle = opts & PF_OPT_SHOWALL; + int brace; + char *p; - memset(&pr, 0, sizeof(pr)); - memcpy(pr.anchor, anchorname, sizeof(pr.anchor)); for (i = 0; i < 3; i++) { + memset(&pr, 0, sizeof(pr)); + memcpy(pr.anchor, anchorname, sizeof(pr.anchor)); pr.rule.action = nattype[i]; if (ioctl(dev, DIOCGETRULES, &pr)) { warn("DIOCGETRULES"); @@ -1209,6 +1211,9 @@ pfctl_show_nat(int dev, int opts, char *anchorname) } mnr = pr.nr; for (nr = 0; nr < mnr; ++nr) { + brace = 0; + INDENT(depth, !(opts & PF_OPT_VERBOSE)); + pr.nr = nr; if (pfctl_get_rule(dev, nr, pr.ticket, anchorname, nattype[i], &rule, pr.anchor_call)) { @@ -1218,15 +1223,37 @@ pfctl_show_nat(int dev, int opts, char *anchorname) if (pfctl_get_pool(dev, &rule.rpool, nr, pr.ticket, nattype[i], anchorname) != 0) return (-1); + + if (pr.anchor_call[0] && + ((((p = strrchr(pr.anchor_call, '_')) != NULL) && + (p == pr.anchor_call || + *(--p) == '/')) || (opts & PF_OPT_RECURSE))) { + brace++; + if ((p = strrchr(pr.anchor_call, '/')) != + NULL) + p++; + else + p = &pr.anchor_call[0]; + } else + p = &pr.anchor_call[0]; + if (dotitle) { pfctl_print_title("TRANSLATION RULES:"); dotitle = 0; } print_rule(&rule, pr.anchor_call, opts & PF_OPT_VERBOSE2, opts & PF_OPT_NUMERIC); - printf("\n"); + if (brace) + printf(" {\n"); + else + printf("\n"); pfctl_print_rule_counters(&rule, opts); pfctl_clear_pool(&rule.rpool); + if (brace) { + pfctl_show_nat(dev, path, opts, p, depth + 1); + INDENT(depth, !(opts & PF_OPT_VERBOSE)); + printf("}\n"); + } } } return (0); @@ -2537,7 +2564,7 @@ main(int argc, char *argv[]) break; case 'n': pfctl_load_fingerprints(dev, opts); - pfctl_show_nat(dev, opts, anchorname); + pfctl_show_nat(dev, path, opts, anchorname, 0); break; case 'q': pfctl_show_altq(dev, ifaceopt, opts, @@ -2565,7 +2592,7 @@ main(int argc, char *argv[]) opts |= PF_OPT_SHOWALL; pfctl_load_fingerprints(dev, opts); - pfctl_show_nat(dev, opts, anchorname); + pfctl_show_nat(dev, path, opts, anchorname, 0); pfctl_show_rules(dev, path, opts, 0, anchorname, 0); pfctl_show_altq(dev, ifaceopt, opts, 0); pfctl_show_states(dev, ifaceopt, opts);