diff options
| author | Manuel Messner <mm@skelett.io> | 2017-02-07 03:14:11 +0100 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2017-02-12 15:34:47 +0100 |
| commit | 9574c263569f477114d7885ebcf5af8af6411582 (patch) | |
| tree | 42d1d91d4e40470f60021b97aaaeffc2a61ae934 /src/evaluate.c | |
| parent | a0cecb3ea474ad24adefcc388267684f2fddd69d (diff) | |
exthdr: prepare exthdr_gen_dependency for tcp support
currently exthdr always needs ipv6 dependency (i.e. link layer), but
with upcomming TCP option matching we also need to include TCP at the
network layer.
This patch prepares this change by adding two parameters to
exthdr_gen_dependency.
Signed-off-by: Manuel Messner <mm@skelett.io>
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'src/evaluate.c')
| -rw-r--r-- | src/evaluate.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/evaluate.c b/src/evaluate.c index 94412f27..0e02548c 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -448,19 +448,20 @@ static int __expr_evaluate_exthdr(struct eval_ctx *ctx, struct expr **exprp) */ static int expr_evaluate_exthdr(struct eval_ctx *ctx, struct expr **exprp) { - const struct proto_desc *base; + const struct proto_desc *base, *dependency = &proto_ip6; + enum proto_bases pb = PROTO_BASE_NETWORK_HDR; struct expr *expr = *exprp; struct stmt *nstmt; - base = ctx->pctx.protocol[PROTO_BASE_NETWORK_HDR].desc; - if (base == &proto_ip6) + base = ctx->pctx.protocol[pb].desc; + if (base == dependency) return __expr_evaluate_exthdr(ctx, exprp); if (base) return expr_error(ctx->msgs, expr, "cannot use exthdr with %s", base->name); - if (exthdr_gen_dependency(ctx, expr, &nstmt) < 0) + if (exthdr_gen_dependency(ctx, expr, dependency, pb - 1, &nstmt) < 0) return -1; list_add(&nstmt->list, &ctx->rule->stmts); |