path: root/src/main.c
diff options
authorPatrick McHardy <>2014-02-04 08:09:27 +0000
committerPatrick McHardy <>2014-02-04 08:17:47 +0000
commit61236968b7a1b4a4986f9a5c9a5e46d3eb70b799 (patch)
tree49cbec37c5e2bc8e1f748d2ae1626af6c1e7df90 /src/main.c
parentf3129a3cc4800321ed2157eb400da8b43398606e (diff)
parser: evaluate commands immediately after parsing
We currently do parsing and evaluation in two seperate stages. This means that if any error occurs during parsing, we won't evaluate the syntactical correct commands and detect possible evaluation errors in them. In order to improve error reporting, change this to evaluate every command as soon as it is fully parsed. With this in place, the ruleset can be fully validated and all errors reported in one step: tests/error.1:6:23-23: Error: syntax error, unexpected newline filter input tcp dport ^ tests/error.1:7:24-26: Error: datatype mismatch, expected internet network service, expression has type Internet protocol filter input tcp dport tcp ~~~~~~~~~ ^^^ tests/error.1:8:24-32: Error: Right hand side of relational expression (==) must be constant filter input tcp dport tcp dport ~~~~~~~~~~^^^^^^^^^ Signed-off-by: Patrick McHardy <>
Diffstat (limited to 'src/main.c')
1 files changed, 1 insertions, 7 deletions
diff --git a/src/main.c b/src/main.c
index 2320a826..9d505776 100644
--- a/src/main.c
+++ b/src/main.c
@@ -216,18 +216,12 @@ out:
int nft_run(void *scanner, struct parser_state *state, struct list_head *msgs)
- struct eval_ctx ctx;
- int ret = 0;
+ int ret;
ret = nft_parse(scanner, state);
if (ret != 0 || state->nerrs > 0)
return -1;
- memset(&ctx, 0, sizeof(ctx));
- ctx.msgs = msgs;
- if (evaluate(&ctx, &state->cmds) < 0)
- return -1;
return nft_netlink(state, msgs);