From: Florian Westphal <fw@xxxxxxxxx>
Once directional zone support is added we also need to print the
direction of the statement, so factor the common code to re-use
this helper from the statement print function.
Signed-off-by: Florian Westphal <fw@xxxxxxxxx>
Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
---
Just a rebase on top of series to store byteorder for set data in
NFTA_SET_USERDATA.
src/ct.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/ct.c b/src/ct.c
index 99f450a77c67..3a6a4e574d69 100644
--- a/src/ct.c
+++ b/src/ct.c
@@ -238,22 +238,27 @@ static const struct ct_template ct_templates[] = {
BYTEORDER_HOST_ENDIAN, 16),
};
-static void ct_expr_print(const struct expr *expr)
+static void ct_print(enum nft_ct_keys key, int8_t dir)
{
const struct symbolic_constant *s;
printf("ct ");
- if (expr->ct.direction < 0)
+ if (dir < 0)
goto done;
for (s = ct_dir_tbl.symbols; s->identifier != NULL; s++) {
- if (expr->ct.direction == (int) s->value) {
+ if (dir == (int)s->value) {
printf("%s ", s->identifier);
break;
}
}
done:
- printf("%s", ct_templates[expr->ct.key].token);
+ printf("%s", ct_templates[key].token);
+}
+
+static void ct_expr_print(const struct expr *expr)
+{
+ ct_print(expr->ct.key, expr->ct.direction);
}
static bool ct_expr_cmp(const struct expr *e1, const struct expr *e2)
--
2.1.4
--
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
