From 3dc1c825d76b678620a13f4f446d384badad5670 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Tue, 17 Oct 2017 15:17:41 +0200 Subject: expr: Introduce nftnl_expr_fprintf() Implement expression printing into a FILE pointer analogous to nftnl_rule_fprintf(). Signed-off-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso --- include/libnftnl/expr.h | 1 + src/expr.c | 14 ++++++++++++++ src/libnftnl.map | 4 ++++ 3 files changed, 19 insertions(+) diff --git a/include/libnftnl/expr.h b/include/libnftnl/expr.h index 76f28fe..f37f509 100644 --- a/include/libnftnl/expr.h +++ b/include/libnftnl/expr.h @@ -39,6 +39,7 @@ const char *nftnl_expr_get_str(const struct nftnl_expr *expr, uint16_t type); bool nftnl_expr_cmp(const struct nftnl_expr *e1, const struct nftnl_expr *e2); int nftnl_expr_snprintf(char *buf, size_t buflen, const struct nftnl_expr *expr, uint32_t type, uint32_t flags); +int nftnl_expr_fprintf(FILE *fp, const struct nftnl_expr *expr, uint32_t type, uint32_t flags); enum { NFTNL_EXPR_PAYLOAD_DREG = NFTNL_EXPR_BASE, diff --git a/src/expr.c b/src/expr.c index c5fcf06..1eae707 100644 --- a/src/expr.c +++ b/src/expr.c @@ -293,3 +293,17 @@ int nftnl_expr_snprintf(char *buf, size_t size, const struct nftnl_expr *expr, return offset; } EXPORT_SYMBOL(nftnl_expr_snprintf); + +static int nftnl_expr_do_snprintf(char *buf, size_t size, const void *e, + uint32_t cmd, uint32_t type, uint32_t flags) +{ + return nftnl_expr_snprintf(buf, size, e, type, flags); +} + +int nftnl_expr_fprintf(FILE *fp, const struct nftnl_expr *expr, uint32_t type, + uint32_t flags) +{ + return nftnl_fprintf(fp, expr, NFTNL_CMD_UNSPEC, type, flags, + nftnl_expr_do_snprintf); +} +EXPORT_SYMBOL(nftnl_expr_fprintf); diff --git a/src/libnftnl.map b/src/libnftnl.map index 1892c98..d59e802 100644 --- a/src/libnftnl.map +++ b/src/libnftnl.map @@ -307,3 +307,7 @@ global: local: *; }; + +LIBNFTNL_6 { + nftnl_expr_fprintf; +} LIBNFTNL_5; -- cgit v1.2.3