path: root/iptables/nft.h
diff options
authorPhil Sutter <>2020-02-21 14:55:52 +0100
committerPhil Sutter <>2020-02-24 12:04:30 +0100
commitd0446ab11182f6ca2adc486a124895f09a220c6e (patch)
tree4ef308fcb3c979fb672db1182c39ac838223dae8 /iptables/nft.h
parent0f40a8bc49d3f7b815336199931a82f919f37c4e (diff)
xtables: Review nft_init()
Move common code into nft_init(), such as: * initial zeroing nft_handle fields * family ops lookup and assignment to 'ops' field * setting of 'family' field This requires minor adjustments in xtables_restore_main() so extra field initialization doesn't happen before nft_init() call. As a side-effect, this fixes segfaulting xtables-monitor binary when printing rules for trace event as in that code-path 'ops' field wasn't initialized. Signed-off-by: Phil Sutter <>
Diffstat (limited to 'iptables/nft.h')
1 files changed, 1 insertions, 1 deletions
diff --git a/iptables/nft.h b/iptables/nft.h
index 51b56603..5cf260a6 100644
--- a/iptables/nft.h
+++ b/iptables/nft.h
@@ -80,7 +80,7 @@ extern const struct builtin_table xtables_bridge[NFT_TABLE_MAX];
int mnl_talk(struct nft_handle *h, struct nlmsghdr *nlh,
int (*cb)(const struct nlmsghdr *nlh, void *data),
void *data);
-int nft_init(struct nft_handle *h, const struct builtin_table *t);
+int nft_init(struct nft_handle *h, int family, const struct builtin_table *t);
void nft_fini(struct nft_handle *h);
int nft_restart(struct nft_handle *h);