iptables-nft: allow removal of empty builtin chains
Florian Westphal
maintainerPATCH v2 1/1 iptables-nft: allow removal of empty builtin chains
The only reason why this is prohibited is that you cannot do it in iptables-legacy.
This removes the artifical limitation.
"iptables-nft -X" will leave the builtin chains alone; Also, deletion is only permitted if the chain is empty.
Signed-off-by Florian Westphal <[email protected]>
---
As per discussion. -X removes all chains, provided all are empty.
NB: DROP policy is also removed implicitly when a base chain is deleted.
iptables/iptables.8.in | 13 ++++--- iptables/nft-cmd.c | 8 ++--- iptables/nft-cmd.h | 4 +-- iptables/nft.c | 78 +++++++++++++++++++++++++++--------------- iptables/nft.h | 4 +-- iptables/xtables-arp.c | 4 +-- iptables/xtables-eb.c | 2 +- iptables/xtables.c | 4 +-- 8 files changed, 72 insertions(+), 45 deletions(-)
iptables/iptables.8.in +8 -5
@@ -25,10 +25,10 @@ .SH NAME iptables/ip6tables \(em administration tool for IPv4/IPv6 packet filtering and NAT .SH SYNOPSIS -\fBiptables\fP [\fB\-t\fP \fItable\fP] {\fB\-A\fP|\fB\-C\fP|\fB\-D\fP} +\fBiptables\fP [\fB\-t\fP \fItable\fP] {\fB\-A\fP|\fB\-C\fP|\fB\-D\fP|\fB-V\fP} \fIchain\fP \fIrule-specification\fP .P -\fBip6tables\fP [\fB\-t\fP \fItable\fP] {\fB\-A\fP|\fB\-C\fP|\fB\-D\fP} +\fBip6tables\fP [\fB\-t\fP \fItable\fP] {\fB\-A\fP|\fB\-C\fP|\fB\-D\fP|\fB-V\fP} \fIchain rule-specification\fP .PP \fBiptables\fP [\fB\-t\fP \fItable\fP] \fB\-I\fP \fIchain\fP [\fIrulenum\fP] \fIrule-specification\fP
@@ -220,11 +220,11 @@ Create a new user-defined chain by the given name. There must be no target of that name already. .TP \fB\-X\fP, \fB\-\-delete\-chain\fP [\fIchain\fP] -Delete the optional user-defined chain specified. There must be no references +Delete the chain specified. There must be no references to the chain. If there are, you must delete or replace the referring rules before the chain can be deleted. The chain must be empty, i.e. not contain -any rules. If no argument is given, it will attempt to delete every -non-builtin chain in the table. +any rules. If no argument is given, it will delete all empty chains in the +table. Empty builtin chains can only be deleted with \fBiptables-nft\fP. .TP \fB\-P\fP, \fB\-\-policy\fP \fIchain target\fP Set the policy for the built-in (non-user-defined) chain to the given target.
@@ -362,6 +362,9 @@ For appending, insertion, deletion and replacement, this causes detailed information on the rule or rules to be printed. \fB\-v\fP may be specified multiple times to possibly emit more detailed debug statements. .TP +\fB\-V\fP, \fB\-\-version\fP +Show program version and the kernel API used. +.TP \fB\-w\fP, \fB\-\-wait\fP [\fIseconds\fP] Wait for the xtables lock. To prevent multiple instances of the program from running concurrently,
iptables/nft-cmd.c +4 -4
@@ -208,12 +208,12 @@ int nft_cmd_chain_user_add(struct nft_handle *h, const char *chain,return 1 ; } -int nft_cmd_chain_user_del (struct nft_handle *h,const char *chain, -const char *table,bool verbose) +int nft_cmd_chain_del (struct nft_handle *h,const char *chain, +const char *table,bool verbose) {struct nft_cmd *cmd; - cmd =nft_cmd_new (h,NFT_COMPAT_CHAIN_USER_DEL , table, chain,NULL ,-1 , + cmd =nft_cmd_new (h,NFT_COMPAT_CHAIN_DEL , table, chain,NULL ,-1 , verbose);if (!cmd)return 0 ;
@@ -320,7 +320,7 @@ int nft_cmd_table_flush(struct nft_handle *h, const char *table, bool verbose)if (verbose) {return nft_cmd_rule_flush (h,NULL , table, verbose) && -nft_cmd_chain_user_del (h,NULL , table, verbose); +nft_cmd_chain_del (h,NULL , table, verbose); } cmd = nft_cmd_new(h, NFT_COMPAT_TABLE_FLUSH, table, NULL, NULL, -1,
iptables/nft-cmd.h +2 -2
@@ -49,8 +49,8 @@ int nft_cmd_zero_counters(struct nft_handle *h, const char *chain, const char *table, bool verbose);int nft_cmd_chain_user_add (struct nft_handle *h,const char *chain,const char *table); -int nft_cmd_chain_user_del (struct nft_handle *h,const char *chain, -const char *table,bool verbose); +int nft_cmd_chain_del (struct nft_handle *h,const char *chain, +const char *table,bool verbose);int nft_cmd_chain_zero_counters (struct nft_handle *h,const char *chain,const char *table,bool verbose); int nft_cmd_rule_list(struct nft_handle *h, const char *chain,
iptables/nft.c +51 -27
170 lines not on this page · raw message
iptables/nft.h +2 -2
@@ -53,7 +53,7 @@ enum obj_update_type {NFT_COMPAT_TABLE_FLUSH ,NFT_COMPAT_CHAIN_ADD ,NFT_COMPAT_CHAIN_USER_ADD , -NFT_COMPAT_CHAIN_USER_DEL , +NFT_COMPAT_CHAIN_DEL ,NFT_COMPAT_CHAIN_USER_FLUSH ,NFT_COMPAT_CHAIN_UPDATE , NFT_COMPAT_CHAIN_RENAME,
@@ -147,7 +147,7 @@ struct nftnl_chain;int nft_chain_set (struct nft_handle *h,const char *table,const char *chain,const char *policy,const struct xt_counters *counters);int nft_chain_save (struct nft_chain *c,void *data);int nft_chain_user_add (struct nft_handle *h,const char *chain,const char *table); -int nft_chain_user_del (struct nft_handle *h,const char *chain,const char *table,bool verbose); +int nft_chain_del (struct nft_handle *h,const char *chain,const char *table,bool verbose);int nft_chain_restore (struct nft_handle *h,const char *chain,const char *table);int nft_chain_user_rename (struct nft_handle *h,const char *chain,const char *table,const char *newname);int nft_chain_zero_counters (struct nft_handle *h,const char *chain,const char *table,bool verbose);
iptables/xtables-arp.c +2 -2
@@ -893,8 +893,8 @@ int do_commandarp(struct nft_handle *h, int argc, char *argv[], char **table, ret =nft_cmd_chain_user_add (h, chain, *table);break ;case CMD_DELETE_CHAIN : - ret =nft_cmd_chain_user_del (h, chain, *table, - options &OPT_VERBOSE ); + ret =nft_cmd_chain_del (h, chain, *table, + options &OPT_VERBOSE );break ;case CMD_RENAME_CHAIN : ret =nft_cmd_chain_user_rename (h, chain, *table, newname);
iptables/xtables-eb.c +1 -1
@@ -779,7 +779,7 @@ int do_commandeb(struct nft_handle *h, int argc, char *argv[], char **table, chain = argv[optind]; optind++; } - ret =nft_cmd_chain_user_del (h, chain, *table,0 ); + ret =nft_cmd_chain_del (h, chain, *table,0 );break ; }
iptables/xtables.c +2 -2
@@ -998,8 +998,8 @@ int do_commandx(struct nft_handle *h, int argc, char *argv[], char **table, ret =nft_cmd_chain_user_add (h, p.chain, p.table);break ;case CMD_DELETE_CHAIN : - ret =nft_cmd_chain_user_del (h, p.chain, p.table, - cs.options &OPT_VERBOSE ); + ret =nft_cmd_chain_del (h, p.chain, p.table, + cs.options &OPT_VERBOSE );break ;case CMD_RENAME_CHAIN : ret =nft_cmd_chain_user_rename (h, p.chain, p.table, p.newname);
Signature · 1 line
2.31.1