diff options
| author | Phil Sutter <phil@nwl.cc> | 2018-08-04 13:10:19 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2018-08-04 23:58:45 +0200 |
| commit | 2ce9f65a374bad212899bc584d3e5f4698df6fc6 (patch) | |
| tree | 471dc1f9624e772b9072c63ef54546453b0ad8e1 /iptables/xtables.c | |
| parent | cd79556bfa15056f2a430e57993a2a64c734b3cf (diff) | |
xtables: Match verbose ip{,6}tables output with legacy
Legacy ip{,6}tables prints feedback for various commands if in verbose
mode, make sure nft variants do the same.
There is one difference, namely when checking a rule (-C command):
Legacy ip{,6}tables print the rule in any case, nft variants don't in
case the rule wasn't found. Changing this though would require to
populate the nftnl_rule object just for printing, which is probably not
feasible.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'iptables/xtables.c')
| -rw-r--r-- | iptables/xtables.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/iptables/xtables.c b/iptables/xtables.c index ca6119b3..64081758 100644 --- a/iptables/xtables.c +++ b/iptables/xtables.c @@ -1213,10 +1213,12 @@ int do_commandx(struct nft_handle *h, int argc, char *argv[], char **table, cs.options&OPT_VERBOSE, h, false); break; case CMD_FLUSH: - ret = nft_rule_flush(h, p.chain, p.table); + ret = nft_rule_flush(h, p.chain, p.table, + cs.options & OPT_VERBOSE); break; case CMD_ZERO: - ret = nft_chain_zero_counters(h, p.chain, p.table); + ret = nft_chain_zero_counters(h, p.chain, p.table, + cs.options & OPT_VERBOSE); break; case CMD_ZERO_NUM: ret = nft_rule_zero_counters(h, p.chain, p.table, @@ -1231,8 +1233,8 @@ int do_commandx(struct nft_handle *h, int argc, char *argv[], char **table, cs.options & OPT_EXPANDED, cs.options & OPT_LINENUMBERS); if (ret && (p.command & CMD_ZERO)) { - ret = nft_chain_zero_counters(h, p.chain, - p.table); + ret = nft_chain_zero_counters(h, p.chain, p.table, + cs.options & OPT_VERBOSE); } if (ret && (p.command & CMD_ZERO_NUM)) { ret = nft_rule_zero_counters(h, p.chain, p.table, @@ -1246,8 +1248,8 @@ int do_commandx(struct nft_handle *h, int argc, char *argv[], char **table, ret = list_rules(h, p.chain, p.table, p.rulenum, cs.options & OPT_VERBOSE); if (ret && (p.command & CMD_ZERO)) { - ret = nft_chain_zero_counters(h, p.chain, - p.table); + ret = nft_chain_zero_counters(h, p.chain, p.table, + cs.options & OPT_VERBOSE); } if (ret && (p.command & CMD_ZERO_NUM)) { ret = nft_rule_zero_counters(h, p.chain, p.table, @@ -1259,7 +1261,8 @@ int do_commandx(struct nft_handle *h, int argc, char *argv[], char **table, ret = nft_chain_user_add(h, p.chain, p.table); break; case CMD_DELETE_CHAIN: - ret = nft_chain_user_del(h, p.chain, p.table); + ret = nft_chain_user_del(h, p.chain, p.table, + cs.options & OPT_VERBOSE); break; case CMD_RENAME_CHAIN: ret = nft_chain_user_rename(h, p.chain, p.table, p.newname); |