expr: add type and flags to snprintf interface

Propagate the type and flags parameter to the expressions, so we can
implement outputs in different formats.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

9 files changed, 18 insertions, 9 deletions

diff --git a/src/expr/bitwise.c b/src/expr/bitwise.c
index 8275758..fdab8e6 100644
--- a/src/expr/bitwise.c
+++ b/src/expr/bitwise.c
@@ -195,7 +195,8 @@ nft_rule_expr_bitwise_parse(struct nft_rule_expr *e, struct nlattr *attr)
 }
 
 static int
-nft_rule_expr_bitwise_snprintf(char *buf, size_t size, struct nft_rule_expr *e)
+nft_rule_expr_bitwise_snprintf(char *buf, size_t size, uint32_t type,
+			       uint32_t flags, struct nft_rule_expr *e)
 {
 	struct nft_expr_bitwise *bitwise = (struct nft_expr_bitwise *)e->data;
 	int len = size, offset = 0, ret, i;
diff --git a/src/expr/cmp.c b/src/expr/cmp.c
index cabaddd..0849c49 100644
--- a/src/expr/cmp.c
+++ b/src/expr/cmp.c
@@ -166,7 +166,8 @@ static char *expr_cmp_str[] = {
 };
 
 static int
-nft_rule_expr_cmp_snprintf(char *buf, size_t size, struct nft_rule_expr *e)
+nft_rule_expr_cmp_snprintf(char *buf, size_t size, uint32_t type,
+			   uint32_t flags, struct nft_rule_expr *e)
 {
 	struct nft_expr_cmp *cmp = (struct nft_expr_cmp *)e->data;
 	int len = size, offset = 0, ret, i;
diff --git a/src/expr/counter.c b/src/expr/counter.c
index 26b7d6f..f0d7617 100644
--- a/src/expr/counter.c
+++ b/src/expr/counter.c
@@ -125,7 +125,8 @@ nft_rule_expr_counter_parse(struct nft_rule_expr *e, struct nlattr *attr)
 }
 
 static int
-nft_rule_expr_counter_snprintf(char *buf, size_t len, struct nft_rule_expr *e)
+nft_rule_expr_counter_snprintf(char *buf, size_t len, uint32_t type,
+			       uint32_t flags, struct nft_rule_expr *e)
 {
 	struct nft_expr_counter *ctr = (struct nft_expr_counter *)e->data;
 
diff --git a/src/expr/immediate.c b/src/expr/immediate.c
index 68c27ec..b5ac602 100644
--- a/src/expr/immediate.c
+++ b/src/expr/immediate.c
@@ -195,7 +195,8 @@ nft_rule_expr_immediate_parse(struct nft_rule_expr *e, struct nlattr *attr)
 }
 
 static int
-nft_rule_expr_immediate_snprintf(char *buf, size_t len, struct nft_rule_expr *e)
+nft_rule_expr_immediate_snprintf(char *buf, size_t len, uint32_t type,
+				 uint32_t flags, struct nft_rule_expr *e)
 {
 	struct nft_expr_immediate *imm = (struct nft_expr_immediate *)e->data;
 
diff --git a/src/expr/match.c b/src/expr/match.c
index 3fc8787..855d210 100644
--- a/src/expr/match.c
+++ b/src/expr/match.c
@@ -184,7 +184,8 @@ static int nft_rule_expr_match_parse(struct nft_rule_expr *e, struct nlattr *att
 }
 
 static int
-nft_rule_expr_match_snprintf(char *buf, size_t len, struct nft_rule_expr *e)
+nft_rule_expr_match_snprintf(char *buf, size_t len, uint32_t type,
+			     uint32_t flags, struct nft_rule_expr *e)
 {
 	struct nft_expr_match *match = (struct nft_expr_match *)e->data;
 
diff --git a/src/expr/meta.c b/src/expr/meta.c
index 0251e43..b7cd201 100644
--- a/src/expr/meta.c
+++ b/src/expr/meta.c
@@ -125,7 +125,8 @@ nft_rule_expr_meta_parse(struct nft_rule_expr *e, struct nlattr *attr)
 }
 
 static int
-nft_rule_expr_meta_snprintf(char *buf, size_t len, struct nft_rule_expr *e)
+nft_rule_expr_meta_snprintf(char *buf, size_t len, uint32_t type,
+			    uint32_t flags, struct nft_rule_expr *e)
 {
 	struct nft_expr_meta *meta = (struct nft_expr_meta *)e->data;
 
diff --git a/src/expr/nat.c b/src/expr/nat.c
index acd9839..17f4459 100644
--- a/src/expr/nat.c
+++ b/src/expr/nat.c
@@ -201,7 +201,8 @@ nft_rule_expr_nat_build(struct nlmsghdr *nlh, struct nft_rule_expr *e)
 }
 
 static int
-nft_rule_expr_nat_snprintf(char *buf, size_t size, struct nft_rule_expr *e)
+nft_rule_expr_nat_snprintf(char *buf, size_t size, uint32_t type,
+			   uint32_t flags, struct nft_rule_expr *e)
 {
 	struct nft_expr_nat *nat = (struct nft_expr_nat *)e->data;
 	int len = size, offset = 0, ret = 0;
diff --git a/src/expr/payload.c b/src/expr/payload.c
index 746a127..f571206 100644
--- a/src/expr/payload.c
+++ b/src/expr/payload.c
@@ -164,7 +164,8 @@ nft_rule_expr_payload_parse(struct nft_rule_expr *e, struct nlattr *attr)
 }
 
 static int
-nft_rule_expr_payload_snprintf(char *buf, size_t len, struct nft_rule_expr *e)
+nft_rule_expr_payload_snprintf(char *buf, size_t len, uint32_t type,
+			       uint32_t flags, struct nft_rule_expr *e)
 {
 	struct nft_expr_payload *payload = (struct nft_expr_payload *)e->data;
 
diff --git a/src/expr/target.c b/src/expr/target.c
index c14bf11..1ee7379 100644
--- a/src/expr/target.c
+++ b/src/expr/target.c
@@ -184,7 +184,8 @@ static int nft_rule_expr_target_parse(struct nft_rule_expr *e, struct nlattr *at
 }
 
 static int
-nft_rule_expr_target_snprintf(char *buf, size_t len, struct nft_rule_expr *e)
+nft_rule_expr_target_snprintf(char *buf, size_t len, uint32_t type,
+			      uint32_t flags, struct nft_rule_expr *e)
 {
 	struct nft_expr_target *target = (struct nft_expr_target *)e->data;