diff options
| author | Jeremy Sowden <jeremy@azazel.net> | 2021-12-21 19:36:53 +0000 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2022-01-15 17:38:48 +0100 |
| commit | 70d05dc511d570b202cdca59c8260650b812b77b (patch) | |
| tree | 276854cd9794cd4ad057faff104bb0ceef988237 /src/netlink.c | |
| parent | b89f9436eb913a9dac2ed157b22d446f252ff35e (diff) | |
src: simplify logic governing storing payload dependencies
There are several places where we check whether `ctx->pdctx.pbase`
equal to `PROTO_BASE_INVALID` and don't bother trying to free the
dependency if so. However, these checks are redundant.
In `payload_match_expand` and `trace_gen_stmts`, we skip a call to
`payload_dependency_kill`, but that calls `payload_dependency_exists` to check a
dependency exists before doing anything else.
In `ct_meta_common_postprocess`, we skip an open-coded equivalent to
`payload_dependency_kill` which performs some different checks, but the
first is the same: a call to `payload_dependency_exists`.
Therefore, we can drop the redundant checks and simplify the flow-
control in the functions.
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'src/netlink.c')
| -rw-r--r-- | src/netlink.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/netlink.c b/src/netlink.c index 5aad8659..15b8878e 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -1939,16 +1939,11 @@ next: if (payload_is_stacked(desc, rel)) b--; - if (lhs->flags & EXPR_F_PROTOCOL && - pctx->pbase == PROTO_BASE_INVALID) { + /* Don't strip 'icmp type' from payload dump. */ + if (pctx->icmp_type == 0) + payload_dependency_kill(pctx, lhs, ctx->family); + if (lhs->flags & EXPR_F_PROTOCOL) payload_dependency_store(pctx, stmt, b); - } else { - /* Don't strip 'icmp type' from payload dump. */ - if (pctx->icmp_type == 0) - payload_dependency_kill(pctx, lhs, ctx->family); - if (lhs->flags & EXPR_F_PROTOCOL) - payload_dependency_store(pctx, stmt, b); - } goto next; } |