exthdr expression requires a dependency on ipv6; we can thus remove an ipv6 protocol test if its present.
Signed-off-by: Florian Westphal <[email protected]> --- src/netlink_delinearize.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c index ae6abb0..eec7d0f 100644 --- a/src/netlink_delinearize.c +++ b/src/netlink_delinearize.c @@ -982,10 +982,10 @@ struct rule_pp_ctx { /* * Kill a redundant payload dependecy that is implied by a higher layer payload expression. */ -static void payload_dependency_kill(struct rule_pp_ctx *ctx, struct expr *expr) +static void __payload_dependency_kill(struct rule_pp_ctx *ctx, enum proto_bases base) { if (ctx->pbase != PROTO_BASE_INVALID && - ctx->pbase == expr->payload.base && + ctx->pbase == base && ctx->pdep != NULL) { list_del(&ctx->pdep->list); stmt_free(ctx->pdep); @@ -996,6 +996,11 @@ static void payload_dependency_kill(struct rule_pp_ctx *ctx, struct expr *expr) } } +static void payload_dependency_kill(struct rule_pp_ctx *ctx, const struct expr *expr) +{ + __payload_dependency_kill(ctx, expr->payload.base); +} + static void payload_dependency_store(struct rule_pp_ctx *ctx, struct stmt *stmt, enum proto_bases base) @@ -1505,8 +1510,10 @@ static void expr_postprocess(struct rule_pp_ctx *ctx, struct expr **exprp) case EXPR_SET_ELEM: expr_postprocess(ctx, &expr->key); break; - case EXPR_SET_REF: case EXPR_EXTHDR: + __payload_dependency_kill(ctx, PROTO_BASE_NETWORK_HDR); + break; + case EXPR_SET_REF: case EXPR_META: case EXPR_VERDICT: break; -- 2.4.10 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
