From: Pablo Neira Ayuso Date: Thu, 4 Apr 2019 11:23:04 +0000 (+0200) Subject: evaluate: improve error reporting in tproxy with inet family X-Git-Tag: v0.9.1~115 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e18d8c2ac23ba173c773b5114b39dac04e5af8db;p=thirdparty%2Fnftables.git evaluate: improve error reporting in tproxy with inet family # nft add rule inet filter divert ip daddr 0.0.0.0/0 meta l4proto tcp tproxy to :2000 Error: conflicting protocols specified: ip vs. unknown. You must specify ip or ip6 family in tproxy statement add rule inet filter divert ip daddr 0.0.0.0/0 meta l4proto tcp tproxy to :2000 ~~~~~~~~ ^^^^^^^^^^^^^^^ instead of: # nft add rule inet filter divert ip daddr 0.0.0.0/0 meta l4proto tcp tproxy to :2000 Error: Conflicting network layer protocols. add rule inet filter divert ip daddr 0.0.0.0/0 meta l4proto tcp tproxy to :2000 ^^^^^^^^^^^^^^^ Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1310 Signed-off-by: Pablo Neira Ayuso --- diff --git a/src/evaluate.c b/src/evaluate.c index 94377da9..3a3f2468 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -2606,8 +2606,11 @@ static int stmt_evaluate_tproxy(struct eval_ctx *ctx, struct stmt *stmt) /* this prevents us from rules like * ip protocol tcp tproxy ip6 to [dead::beef] */ - return stmt_error(ctx, stmt, - "Conflicting network layer protocols."); + return stmt_binary_error(ctx, stmt, + &ctx->pctx.protocol[PROTO_BASE_NETWORK_HDR], + "conflicting protocols specified: %s vs. %s. You must specify ip or ip6 family in tproxy statement", + ctx->pctx.protocol[PROTO_BASE_NETWORK_HDR].desc->name, + family2str(stmt->tproxy.family)); if (stmt->tproxy.addr != NULL) { if (stmt->tproxy.addr->etype == EXPR_RANGE)