From a698868d52a550bab4867c0dc502037155baa11d Mon Sep 17 00:00:00 2001 From: Pablo Neira Ayuso Date: Fri, 12 Dec 2014 19:26:46 +0100 Subject: parser: use 'redirect to PORT' instead of 'redirect :PORT' Small syntax update suggested by Patrick. Signed-off-by: Pablo Neira Ayuso --- src/parser_bison.y | 5 +++-- src/scanner.l | 1 + src/statement.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/parser_bison.y b/src/parser_bison.y index 515a11a0..99dbd088 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -196,6 +196,7 @@ static void location_update(struct location *loc, struct location *rhs, int n) %token JUMP "jump" %token GOTO "goto" %token RETURN "return" +%token TO "to" %token CONSTANT "constant" %token INTERVAL "interval" @@ -1439,7 +1440,7 @@ redir_stmt : redir_stmt_alloc redir_stmt_arg redir_stmt_alloc : REDIRECT { $$ = redir_stmt_alloc(&@$); } ; -redir_stmt_arg : COLON expr +redir_stmt_arg : TO expr { $0->redir.proto = $2; } @@ -1447,7 +1448,7 @@ redir_stmt_arg : COLON expr { $0->redir.flags = $1; } - | COLON expr nf_nat_flags + | TO expr nf_nat_flags { $0->redir.proto = $2; $0->redir.flags = $3; diff --git a/src/scanner.l b/src/scanner.l index 17231594..ed87da61 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -250,6 +250,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "jump" { return JUMP; } "goto" { return GOTO; } "return" { return RETURN; } +"to" { return TO; } "inet" { return INET; } diff --git a/src/statement.c b/src/statement.c index 83abfeac..d72c6e9b 100644 --- a/src/statement.c +++ b/src/statement.c @@ -354,7 +354,7 @@ static void redir_stmt_print(const struct stmt *stmt) printf("redirect"); if (stmt->redir.proto) { - printf(" :"); + printf(" to "); expr_print(stmt->redir.proto); } -- cgit v1.2.3