[nft PATCH 2/2] evaluate: reject: enhance the error support throwing messages with more details

[Alvaro Neira Ayuso]

If we add a rule like:

nft add rule bridge filter input ether type ip reject with icmpv6 type no-route

We throw an error like:

<cmdline>:1:44-49: Error: conflicting protocols specified: ip vs ip6
add rule bridge filter input ether type ip reject with icmpv6 type no-route

Now, we are going to show in which part of the rule, we have the conflict:

<cmdline>:1:51-75: Error: conflicting protocols specified: ip vs ip6
add rule bridge filter input ether type ip reject with icmpv6 type no-route
~~~~~~~~~~~~~ ^^^^^^^^^^^^^^^^^^^^^^^^^

Signed-off-by: Alvaro Neira Ayuso <***@gmail.com>
---
src/evaluate.c | 32 +++++++++++++++++++++-----------
1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/evaluate.c b/src/evaluate.c
index 2dd49fa..e43a8b9 100644
--- a/src/evaluate.c
+++ b/src/evaluate.c
@@ -1213,7 +1213,8 @@ static int stmt_evaluate_reject_inet_family(struct eval_ctx *ctx,
case NFT_REJECT_TCP_RST:
break;
case NFT_REJECT_ICMPX_UNREACH:
- return stmt_error(ctx, stmt,
+ return stmt_binary_error(ctx, stmt->reject.expr,
+ &ctx->pctx.protocol[PROTO_BASE_NETWORK_HDR],
"conflicting network protocol specified");
case NFT_REJECT_ICMP_UNREACH:
base = ctx->pctx.protocol[PROTO_BASE_LL_HDR].desc;
@@ -1222,12 +1223,14 @@ static int stmt_evaluate_reject_inet_family(struct eval_ctx *ctx,
case NFPROTO_IPV4:
if (stmt->reject.family == NFPROTO_IPV4)
break;
- return stmt_error(ctx, stmt,
+ return stmt_binary_error(ctx, stmt->reject.expr,
+ &ctx->pctx.protocol[PROTO_BASE_NETWORK_HDR],
"conflicting protocols specified: ip vs ip6");
case NFPROTO_IPV6:
if (stmt->reject.family == NFPROTO_IPV6)
break;
- return stmt_error(ctx, stmt,
+ return stmt_binary_error(ctx, stmt->reject.expr,
+ &ctx->pctx.protocol[PROTO_BASE_NETWORK_HDR],
"conflicting protocols specified: ip vs ip6");
default:
BUG("unsupported family");
@@ -1263,7 +1266,8 @@ static int stmt_evaluate_reject_bridge_family(struct eval_ctx *ctx,

switch (stmt->reject.type) {
case NFT_REJECT_ICMPX_UNREACH:
- return stmt_error(ctx, stmt,
+ return stmt_binary_error(ctx, stmt->reject.expr,
+ &ctx->pctx.protocol[PROTO_BASE_NETWORK_HDR],
"conflicting network protocol specified");
case NFT_REJECT_TCP_RST:
base = ctx->pctx.protocol[PROTO_BASE_LL_HDR].desc;
@@ -1273,7 +1277,8 @@ static int stmt_evaluate_reject_bridge_family(struct eval_ctx *ctx,
case __constant_htons(ETH_P_IPV6):
break;
default:
- return stmt_error(ctx, stmt,
+ return stmt_binary_error(ctx, stmt->reject.expr,
+ &ctx->pctx.protocol[PROTO_BASE_NETWORK_HDR],
"cannot reject this ether type");
}
break;
@@ -1284,15 +1289,18 @@ static int stmt_evaluate_reject_bridge_family(struct eval_ctx *ctx,
case __constant_htons(ETH_P_IP):
if (NFPROTO_IPV4 == stmt->reject.family)
break;
- return stmt_error(ctx, stmt,
+ return stmt_binary_error(ctx, stmt->reject.expr,
+ &ctx->pctx.protocol[PROTO_BASE_NETWORK_HDR],
"conflicting protocols specified: ip vs ip6");
case __constant_htons(ETH_P_IPV6):
if (NFPROTO_IPV6 == stmt->reject.family)
break;
- return stmt_error(ctx, stmt,
+ return stmt_binary_error(ctx, stmt->reject.expr,
+ &ctx->pctx.protocol[PROTO_BASE_NETWORK_HDR],
"conflicting protocols specified: ip vs ip6");
default:
- return stmt_error(ctx, stmt,
+ return stmt_binary_error(ctx, stmt,
+ &ctx->pctx.protocol[PROTO_BASE_NETWORK_HDR],
"cannot reject this ether type");
}
break;
@@ -1331,11 +1339,12 @@ static int stmt_evaluate_reject_family(struct eval_ctx *ctx, struct stmt *stmt,
return -1;
break;
case NFT_REJECT_ICMPX_UNREACH:
- return stmt_error(ctx, stmt,
+ return stmt_binary_error(ctx, stmt->reject.expr, stmt,
"abstracted ICMP unreachable not supported");
case NFT_REJECT_ICMP_UNREACH:
if (stmt->reject.family != ctx->pctx.family)
- return stmt_error(ctx, stmt,
+ return stmt_binary_error(ctx, stmt->reject.expr,
+ stmt,
"conflicting protocols specified: ip vs ip6");
break;
}
@@ -1452,7 +1461,8 @@ static int stmt_evaluate_reset(struct eval_ctx *ctx, struct stmt *stmt)
break;
default:
if (stmt->reject.type == NFT_REJECT_TCP_RST) {
- return stmt_error(ctx, stmt,
+ return stmt_binary_error(ctx, stmt,
+ &ctx->pctx.protocol[PROTO_BASE_TRANSPORT_HDR],
"you cannot use tcp reset with this protocol");
}
break;