diff options
| author | Phil Sutter <phil@nwl.cc> | 2021-01-26 17:06:33 +0100 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2021-01-27 17:21:25 +0100 |
| commit | a206f22bdbd03a9c8dcf2f98e3ed7566b198d281 (patch) | |
| tree | afc61153b63ccfabf0f07e6c1bc8ebda1e010567 /src/evaluate.c | |
| parent | 990cbbf75c40b92e6d6dc66721dfbedf33cacf8f (diff) | |
reject: Fix for missing dependencies in netdev family
Like with bridge family, rejecting with either icmp or icmpv6 must
create a dependency match on meta protocol. Upon delinearization, treat
netdev reject identical to bridge as well so no family info is lost.
This makes reject statement in netdev family fully symmetric so fix
the tests in tests/py/netdev/reject.t, adjust the related payload dumps
and add JSON equivalents which were missing altogether.
Fixes: 0c42a1f2a0cc5 ("evaluate: add netdev support for reject default")
Fixes: a51a0bec1f698 ("tests: py: add netdev folder and reject.t icmp cases")
Cc: Jose M. Guisado Gomez <guigom@riseup.net>
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'src/evaluate.c')
| -rw-r--r-- | src/evaluate.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/evaluate.c b/src/evaluate.c index 3a91e9ea..1d5db4da 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -2718,7 +2718,7 @@ static int stmt_evaluate_reject_bridge(struct eval_ctx *ctx, struct stmt *stmt, const struct proto_desc *desc; desc = ctx->pctx.protocol[PROTO_BASE_LL_HDR].desc; - if (desc != &proto_eth && desc != &proto_vlan) + if (desc != &proto_eth && desc != &proto_vlan && desc != &proto_netdev) return stmt_binary_error(ctx, &ctx->pctx.protocol[PROTO_BASE_LL_HDR], stmt, "unsupported link layer protocol"); @@ -2758,6 +2758,7 @@ static int stmt_evaluate_reject_family(struct eval_ctx *ctx, struct stmt *stmt, } break; case NFPROTO_BRIDGE: + case NFPROTO_NETDEV: if (stmt_evaluate_reject_bridge(ctx, stmt, expr) < 0) return -1; break; |