From b4c7117ef552d0d71bde1db4a047b4c005699951 Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Sat, 20 Jan 2018 13:38:55 +0100 Subject: Revert ("src: Remove xt_stmt_() functions"). Revert commit bce55916b51ec1a4c23322781e3b0c698ecc9561, we need this code in place to properly make translation when iptables-compat loads rules. Reported-by: Duncan Roe Signed-off-by: Pablo Neira Ayuso --- include/statement.h | 2 ++ include/xt.h | 7 +++++++ 2 files changed, 9 insertions(+) (limited to 'include') diff --git a/include/statement.h b/include/statement.h index 23a551b6..379d99e4 100644 --- a/include/statement.h +++ b/include/statement.h @@ -203,6 +203,8 @@ struct xt_stmt { void *entry; }; +extern struct stmt *xt_stmt_alloc(const struct location *loc); + /** * enum stmt_types - statement types * diff --git a/include/xt.h b/include/xt.h index dfdf9ee0..753511e6 100644 --- a/include/xt.h +++ b/include/xt.h @@ -8,6 +8,9 @@ struct rule_pp_ctx; struct rule; #ifdef HAVE_LIBXTABLES +void xt_stmt_xlate(const struct stmt *stmt); +void xt_stmt_release(const struct stmt *stmt); + void netlink_parse_target(struct netlink_parse_ctx *ctx, const struct location *loc, const struct nftnl_expr *nle); @@ -17,6 +20,9 @@ void netlink_parse_match(struct netlink_parse_ctx *ctx, void stmt_xt_postprocess(struct rule_pp_ctx *rctx, struct stmt *stmt, struct rule *rule); #else +static inline void xt_stmt_xlate(const struct stmt *stmt) {} +static inline void xt_stmt_release(const struct stmt *stmt) {} + #include static inline void netlink_parse_target(struct netlink_parse_ctx *ctx, @@ -29,4 +35,5 @@ static inline void stmt_xt_postprocess(struct rule_pp_ctx *rctx, struct stmt *stmt, struct rule *rule) {} #endif + #endif /* _NFT_XT_H_ */ -- cgit v1.2.3