From 7feece21f72ebf4633048b2dd447e31da30819fb Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Tue, 8 May 2018 13:08:35 +0200 Subject: libnftables: Make some functions globally accessible This removes static flag and adds header prototype for the following functions: * must_print_eq_op() from src/expression.c * fib_result_str() from src/fib.c * set_policy2str() and chain_policy2str from src/rule.c In fib.h, include linux/netfilter/nf_tables.h to make sure enum nft_fib_result is known when including this file. Signed-off-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso --- src/expression.c | 2 +- src/fib.c | 2 +- src/rule.c | 4 ++-- src/statement.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/expression.c b/src/expression.c index c3b6fb22..3c5ea0ff 100644 --- a/src/expression.c +++ b/src/expression.c @@ -558,7 +558,7 @@ static void binop_arg_print(const struct expr *op, const struct expr *arg, nft_print(octx, ")"); } -static bool must_print_eq_op(const struct expr *expr) +bool must_print_eq_op(const struct expr *expr) { return expr->left->ops->type == EXPR_BINOP; } diff --git a/src/fib.c b/src/fib.c index 21bc69a9..069411f0 100644 --- a/src/fib.c +++ b/src/fib.c @@ -52,7 +52,7 @@ const struct datatype fib_addr_type = { .sym_tbl = &addrtype_tbl, }; -static const char *fib_result_str(enum nft_fib_result result) +const char *fib_result_str(enum nft_fib_result result) { if (result <= NFT_FIB_RESULT_MAX) return fib_result[result]; diff --git a/src/rule.c b/src/rule.c index 5f73bebc..a3ed5179 100644 --- a/src/rule.c +++ b/src/rule.c @@ -295,7 +295,7 @@ struct print_fmt_options { const char *stmt_separator; }; -static const char *set_policy2str(uint32_t policy) +const char *set_policy2str(uint32_t policy) { switch (policy) { case NFT_SET_POL_PERFORMANCE: @@ -740,7 +740,7 @@ const char *hooknum2str(unsigned int family, unsigned int hooknum) return "unknown"; } -static const char *chain_policy2str(uint32_t policy) +const char *chain_policy2str(uint32_t policy) { switch (policy) { case NF_DROP: diff --git a/src/statement.c b/src/statement.c index a5ef7d7d..6537bbbd 100644 --- a/src/statement.c +++ b/src/statement.c @@ -178,7 +178,7 @@ static const char *objref_type[NFT_OBJECT_MAX + 1] = { [NFT_OBJECT_LIMIT] = "limit", }; -static const char *objref_type_name(uint32_t type) +const char *objref_type_name(uint32_t type) { if (type > NFT_OBJECT_MAX) return "unknown"; @@ -225,7 +225,7 @@ static const char *syslog_level[LOG_DEBUG + 1] = { [LOG_DEBUG] = "debug", }; -static const char *log_level(uint32_t level) +const char *log_level(uint32_t level) { if (level > LOG_DEBUG) return "unknown"; -- cgit v1.2.3