diff options
| author | Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com> | 2014-02-11 18:36:43 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-02-12 10:10:10 +0100 |
| commit | 690ea18fdd6f8bc12322a729a2f7c97d8e731c43 (patch) | |
| tree | 430d646144110a8b97c31c621516c913431f8941 | |
| parent | 837629fed24af7298fbf4cd28c7a51f24b70ee93 (diff) | |
nft: A builtin chain might be created when restoring
nft_chain_set() is directly used in xtables-restore.c, however at that
point no builtin chains have been created yet thus the need to request
to build it relevantly.
Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
| -rw-r--r-- | iptables/nft.c | 1 | ||||
| -rw-r--r-- | iptables/nft.h | 1 | ||||
| -rw-r--r-- | iptables/xtables-restore.c | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/iptables/nft.c b/iptables/nft.c index 36ac69cc..501c6d86 100644 --- a/iptables/nft.c +++ b/iptables/nft.c @@ -744,6 +744,7 @@ __nft_chain_set(struct nft_handle *h, const char *table, } nlh = nft_chain_nlmsg_build_hdr(buf, NFT_MSG_NEWCHAIN, h->family, + h->restore ? NLM_F_ACK|NLM_F_CREATE : NLM_F_ACK, h->seq); nft_chain_nlmsg_build_payload(nlh, c); diff --git a/iptables/nft.h b/iptables/nft.h index 92488764..3b58d514 100644 --- a/iptables/nft.h +++ b/iptables/nft.h @@ -34,6 +34,7 @@ struct nft_handle { struct mnl_nlmsg_batch *batch; struct nft_family_ops *ops; struct builtin_table *tables; + bool restore; }; extern struct builtin_table xtables_ipv4[TABLES_MAX]; diff --git a/iptables/xtables-restore.c b/iptables/xtables-restore.c index 730800ff..f7850bb2 100644 --- a/iptables/xtables-restore.c +++ b/iptables/xtables-restore.c @@ -170,6 +170,7 @@ xtables_restore_main(int family, const char *progname, int argc, char *argv[]) { struct nft_handle h = { .family = family, + .restore = true, }; char buffer[10240]; int c; |