From: Phil Sutter <phil@nwl.cc>
Date: Tue, 20 Aug 2019 20:16:41 +0000 (+0200)
Subject: nft: Embed rule's table name in nft_xt_ctx
X-Git-Tag: v1.8.4~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f873ed5dc5c4deb0cf9a6d6876a04e610d735f9;p=thirdparty%2Fiptables.git

nft: Embed rule's table name in nft_xt_ctx

Down to the point where expression parsing happens, the rule's table is
not known anymore but relevant if set lookups are required.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/iptables/nft-shared.c b/iptables/nft-shared.c
index a67302ee..19630c1e 100644
--- a/iptables/nft-shared.c
+++ b/iptables/nft-shared.c
@@ -597,6 +597,7 @@ void nft_rule_to_iptables_command_state(struct nft_handle *h,
 	struct nft_xt_ctx ctx = {
 		.cs = cs,
 		.h = h,
+		.table = nftnl_rule_get_str(r, NFTNL_RULE_TABLE),
 	};
 
 	iter = nftnl_expr_iter_create(r);
diff --git a/iptables/nft-shared.h b/iptables/nft-shared.h
index 4dc44b84..91762d2e 100644
--- a/iptables/nft-shared.h
+++ b/iptables/nft-shared.h
@@ -51,6 +51,7 @@ struct nft_xt_ctx {
 	struct nftnl_expr_iter *iter;
 	struct nft_handle *h;
 	uint32_t flags;
+	const char *table;
 
 	uint32_t reg;
 	struct {