diff options
| -rw-r--r-- | src/netlink_delinearize.c | 10 | ||||
| -rw-r--r-- | src/payload.c | 18 |
2 files changed, 14 insertions, 14 deletions
diff --git a/src/netlink_delinearize.c b/src/netlink_delinearize.c index 39b0574e..36ead802 100644 --- a/src/netlink_delinearize.c +++ b/src/netlink_delinearize.c @@ -2079,14 +2079,10 @@ static bool meta_may_dependency_kill(struct payload_dep_ctx *ctx, case NFPROTO_NETDEV: case NFPROTO_BRIDGE: break; + case NFPROTO_IPV4: + case NFPROTO_IPV6: + return family == nfproto; default: - if (family == NFPROTO_IPV4 && - nfproto != NFPROTO_IPV4) - return false; - else if (family == NFPROTO_IPV6 && - nfproto != NFPROTO_IPV6) - return false; - return true; } diff --git a/src/payload.c b/src/payload.c index 79008762..576eb149 100644 --- a/src/payload.c +++ b/src/payload.c @@ -733,13 +733,17 @@ static bool payload_may_dependency_kill(struct payload_dep_ctx *ctx, break; } - if (expr->payload.base == PROTO_BASE_TRANSPORT_HDR && - dep->left->payload.base == PROTO_BASE_TRANSPORT_HDR) { - if (dep->left->payload.desc == &proto_icmp) - return payload_may_dependency_kill_icmp(ctx, expr); - if (dep->left->payload.desc == &proto_icmp6) - return payload_may_dependency_kill_icmp(ctx, expr); - } + if (expr->payload.base != PROTO_BASE_TRANSPORT_HDR) + return true; + + if (dep->left->payload.base != PROTO_BASE_TRANSPORT_HDR) + return true; + + if (dep->left->payload.desc == &proto_icmp) + return payload_may_dependency_kill_icmp(ctx, expr); + + if (dep->left->payload.desc == &proto_icmp6) + return payload_may_dependency_kill_icmp(ctx, expr); return true; } |