summaryrefslogtreecommitdiffstats
path: root/src/main.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2014-02-04 08:09:27 +0000
committerPatrick McHardy <kaber@trash.net>2014-02-04 08:12:01 +0000
commitf3129a3cc4800321ed2157eb400da8b43398606e (patch)
tree9eb9a47256de3a19f1571abc80854556fcdf7acd /src/main.c
parentf164cb18c0a94701a641bce4f141d51990b8eef1 (diff)
parser: recover from errors in any block
Move error recovery to the common_block definition to handle errors in any block. Queue those errors and abort parsing once a threshold is reached. With this in place, we can continue parsing when errors occur and show all of them to the user at once. tests/error.1:3:8-8: Error: syntax error, unexpected '{', expecting string filter { ^ tests/error.1:4:13-13: Error: syntax error, unexpected newline filter input ^ tests/error.1:5:17-17: Error: syntax error, unexpected newline filter input tcp ^ tests/error.1:6:23-23: Error: syntax error, unexpected newline filter input tcp dport Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c
index 28ce1aa6..2320a826 100644
--- a/src/main.c
+++ b/src/main.c
@@ -26,6 +26,7 @@
#include <erec.h>
#include <mnl.h>
+unsigned int max_errors = 10;
unsigned int numeric_output;
unsigned int handle_output;
#ifdef DEBUG
@@ -219,7 +220,7 @@ int nft_run(void *scanner, struct parser_state *state, struct list_head *msgs)
int ret = 0;
ret = nft_parse(scanner, state);
- if (ret != 0)
+ if (ret != 0 || state->nerrs > 0)
return -1;
memset(&ctx, 0, sizeof(ctx));