Preparing ebtables-save implementation, allow for callers to pass format
bits to nft_rule_save() instead of just the 'counters' boolean.
Signed-off-by: Phil Sutter <phil@xxxxxx>
---
iptables/nft.c | 5 ++---
iptables/nft.h | 2 +-
iptables/xtables-save.c | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/iptables/nft.c b/iptables/nft.c
index 7889822af87f1..b1516692361d1 100644
--- a/iptables/nft.c
+++ b/iptables/nft.c
@@ -1375,7 +1375,7 @@ retry:
return list;
}
-int nft_rule_save(struct nft_handle *h, const char *table, bool counters)
+int nft_rule_save(struct nft_handle *h, const char *table, unsigned int format)
{
struct nftnl_rule_list *list;
struct nftnl_rule_list_iter *iter;
@@ -1397,8 +1397,7 @@ int nft_rule_save(struct nft_handle *h, const char *table, bool counters)
if (strcmp(table, rule_table) != 0)
goto next;
- nft_rule_print_save(r, NFT_RULE_APPEND,
- counters ? 0 : FMT_NOCOUNTS);
+ nft_rule_print_save(r, NFT_RULE_APPEND, format);
next:
r = nftnl_rule_list_iter_next(iter);
diff --git a/iptables/nft.h b/iptables/nft.h
index a3f5c202d8f57..17031871c8e3d 100644
--- a/iptables/nft.h
+++ b/iptables/nft.h
@@ -98,7 +98,7 @@ int nft_rule_delete_num(struct nft_handle *h, const char *chain, const char *tab
int nft_rule_replace(struct nft_handle *h, const char *chain, const char *table, void *data, int rulenum, bool verbose);
int nft_rule_list(struct nft_handle *h, const char *chain, const char *table, int rulenum, unsigned int format);
int nft_rule_list_save(struct nft_handle *h, const char *chain, const char *table, int rulenum, int counters);
-int nft_rule_save(struct nft_handle *h, const char *table, bool counters);
+int nft_rule_save(struct nft_handle *h, const char *table, unsigned int format);
int nft_rule_flush(struct nft_handle *h, const char *chain, const char *table);
int nft_rule_zero_counters(struct nft_handle *h, const char *chain, const char *table, int rulenum);
diff --git a/iptables/xtables-save.c b/iptables/xtables-save.c
index c19c9991e5a60..e6bad32fa0b81 100644
--- a/iptables/xtables-save.c
+++ b/iptables/xtables-save.c
@@ -70,7 +70,7 @@ __do_output(struct nft_handle *h, const char *tablename, bool counters)
/* Dump out chain names first,
* thereby preventing dependency conflicts */
nft_chain_save(h, chain_list, tablename);
- nft_rule_save(h, tablename, counters);
+ nft_rule_save(h, tablename, counters ? 0 : FMT_NOCOUNTS);
now = time(NULL);
printf("COMMIT\n");
--
2.18.0
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
