From d0f3b9eaab8d77eed94ec74e3c91218ca76da34d Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Tue, 8 Dec 2020 23:51:59 +0100 Subject: payload: auto-remove simple icmp/icmpv6 dependency expressions Instead of: icmpv6 type packet-too-big icmpv6 mtu 1280 display just icmpv6 mtu 1280 The dependency added for id/sequence is still kept, its handled by a anon set instead to cover both the echo 'request' and 'reply' cases. Signed-off-by: Florian Westphal --- src/netlink_delinearize.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/netlink_delinearize.c') diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c index 9faddde6..8b06c4c0 100644 --- a/src/netlink_delinearize.c +++ b/src/netlink_delinearize.c @@ -1771,6 +1771,9 @@ static void payload_match_expand(struct rule_pp_ctx *ctx, enum proto_bases base = left->payload.base; bool stacked; + if (ctx->pdctx.icmp_type) + ctx->pctx.th_dep.icmp.type = ctx->pdctx.icmp_type; + payload_expr_expand(&list, left, &ctx->pctx); list_for_each_entry(left, &list, list) { -- cgit v1.2.3