From cc6fef3521c2fdfba4b1daf7be09349e7d807ae1 Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Fri, 8 Feb 2019 17:02:20 +0100 Subject: src: payload: export and use payload_expr_cmp expr->ops is going away, so export payload cmp and use it directly. Signed-off-by: Florian Westphal Acked-by: Pablo Neira Ayuso --- include/payload.h | 2 ++ src/netlink_delinearize.c | 2 +- src/payload.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/payload.h b/include/payload.h index 161c64ae..a914d239 100644 --- a/include/payload.h +++ b/include/payload.h @@ -59,4 +59,6 @@ extern void payload_expr_expand(struct list_head *list, struct expr *expr, extern void payload_expr_complete(struct expr *expr, const struct proto_ctx *ctx); +bool payload_expr_cmp(const struct expr *e1, const struct expr *e2); + #endif /* NFTABLES_PAYLOAD_H */ diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c index d492910c..21c6858a 100644 --- a/src/netlink_delinearize.c +++ b/src/netlink_delinearize.c @@ -2371,7 +2371,7 @@ static void stmt_payload_binop_postprocess(struct rule_pp_ctx *ctx) if (payload->ops->type != EXPR_PAYLOAD) return; - if (!payload->ops->cmp(stmt->payload.expr, payload)) + if (!payload_expr_cmp(stmt->payload.expr, payload)) return; mask = binop->right; diff --git a/src/payload.c b/src/payload.c index f638b0c0..5fd2a07b 100644 --- a/src/payload.c +++ b/src/payload.c @@ -54,7 +54,7 @@ static void payload_expr_print(const struct expr *expr, struct output_ctx *octx) expr->payload.offset, expr->len); } -static bool payload_expr_cmp(const struct expr *e1, const struct expr *e2) +bool payload_expr_cmp(const struct expr *e1, const struct expr *e2) { return e1->payload.desc == e2->payload.desc && e1->payload.tmpl == e2->payload.tmpl && -- cgit v1.2.3