src: get rid of __payload_dependency_kill()

Use payload_dependency_release() instead.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/include/payload.h b/include/payload.h
index dec4647aad9fa852e97f0de4ab88397fa195b6c4..161c64aedf11bfdf36f2f2fe3f0a8bdf2b924dbc 100644 (file)
--- a/include/payload.h
+++ b/include/payload.h
@@ -42,8 +42,7 @@ extern void payload_dependency_store(struct payload_dep_ctx *ctx,
                                     enum proto_bases base);
 extern bool payload_dependency_exists(const struct payload_dep_ctx *ctx,
                                      enum proto_bases base);
-extern void __payload_dependency_kill(struct payload_dep_ctx *ctx,
-                                     unsigned int family);
+extern void payload_dependency_release(struct payload_dep_ctx *ctx);
 extern void payload_dependency_kill(struct payload_dep_ctx *ctx,
                                    struct expr *expr, unsigned int family);
 extern void exthdr_dependency_kill(struct payload_dep_ctx *ctx,

diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c
index f4b943964fc9559aaecf1a2976a58274374c653b..b9f195b07d63b0816a707cd02a22f3f03a5b2290 100644 (file)
--- a/src/netlink_delinearize.c
+++ b/src/netlink_delinearize.c
@@ -1408,8 +1408,7 @@ static void ct_meta_common_postprocess(struct rule_pp_ctx *ctx,
                        payload_dependency_store(&ctx->pdctx, ctx->stmt, base);
                } else if (ctx->pdctx.pbase < PROTO_BASE_TRANSPORT_HDR) {
                        if (payload_dependency_exists(&ctx->pdctx, base))
-                               __payload_dependency_kill(&ctx->pdctx,
-                                                         ctx->pctx.family);
+                               payload_dependency_release(&ctx->pdctx);
                        if (left->flags & EXPR_F_PROTOCOL)
                                payload_dependency_store(&ctx->pdctx, ctx->stmt, base);
                }
@@ -1874,8 +1873,7 @@ static void stmt_reject_postprocess(struct rule_pp_ctx *rctx)
                if (stmt->reject.type == NFT_REJECT_TCP_RST &&
                    payload_dependency_exists(&rctx->pdctx,
                                              PROTO_BASE_TRANSPORT_HDR))
-                       __payload_dependency_kill(&rctx->pdctx,
-                                                 rctx->pctx.family);
+                       payload_dependency_release(&rctx->pdctx);
                break;
        case NFPROTO_IPV6:
                stmt->reject.family = rctx->pctx.family;
@@ -1883,8 +1881,7 @@ static void stmt_reject_postprocess(struct rule_pp_ctx *rctx)
                if (stmt->reject.type == NFT_REJECT_TCP_RST &&
                    payload_dependency_exists(&rctx->pdctx,
                                              PROTO_BASE_TRANSPORT_HDR))
-                       __payload_dependency_kill(&rctx->pdctx,
-                                                 rctx->pctx.family);
+                       payload_dependency_release(&rctx->pdctx);
                break;
        case NFPROTO_INET:
                if (stmt->reject.type == NFT_REJECT_ICMPX_UNREACH) {

diff --git a/src/payload.c b/src/payload.c
index df59ac8adcace90f33b1a0c914cb81c9ef32de20..383aed039a5e042bc3bcde5335fc9694618b5bda 100644 (file)
--- a/src/payload.c
+++ b/src/payload.c
@@ -445,7 +445,7 @@ bool payload_dependency_exists(const struct payload_dep_ctx *ctx,
               ctx->pdep != NULL;
 }
 
-static void payload_dependency_release(struct payload_dep_ctx *ctx)
+void payload_dependency_release(struct payload_dep_ctx *ctx)
 {
        list_del(&ctx->pdep->list);
        stmt_free(ctx->pdep);
@@ -457,7 +457,7 @@ static void payload_dependency_release(struct payload_dep_ctx *ctx)
 }
 
 /**
- * __payload_dependency_kill - kill a redundant payload depedency
+ * payload_dependency_kill - kill a redundant payload depedency
  *
  * @ctx: payload dependency context
  * @expr: higher layer payload expression
@@ -465,16 +465,11 @@ static void payload_dependency_release(struct payload_dep_ctx *ctx)
  * Kill a redundant payload expression if a higher layer payload expression
  * implies its existance.
  */
-void __payload_dependency_kill(struct payload_dep_ctx *ctx, unsigned int family)
-{
-       payload_dependency_release(ctx);
-}
-
 void payload_dependency_kill(struct payload_dep_ctx *ctx, struct expr *expr,
                             unsigned int family)
 {
        if (payload_dependency_exists(ctx, expr->payload.base))
-               __payload_dependency_kill(ctx, family);
+               payload_dependency_release(ctx);
 }
 
 void exthdr_dependency_kill(struct payload_dep_ctx *ctx, struct expr *expr,
@@ -483,11 +478,11 @@ void exthdr_dependency_kill(struct payload_dep_ctx *ctx, struct expr *expr,
        switch (expr->exthdr.op) {
        case NFT_EXTHDR_OP_TCPOPT:
                if (payload_dependency_exists(ctx, PROTO_BASE_TRANSPORT_HDR))
-                       __payload_dependency_kill(ctx, family);
+                       payload_dependency_release(ctx);
                break;
        case NFT_EXTHDR_OP_IPV6:
                if (payload_dependency_exists(ctx, PROTO_BASE_NETWORK_HDR))
-                       __payload_dependency_kill(ctx, family);
+                       payload_dependency_release(ctx);
                break;
        default:
                break;