summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPablo Neira Ayuso <pablo@netfilter.org>2014-12-12 19:26:46 +0100
committerPablo Neira Ayuso <pablo@netfilter.org>2014-12-12 20:15:51 +0100
commita698868d52a550bab4867c0dc502037155baa11d (patch)
treea43ec0ef1fa75478678ef92d32c5fe75224c75e8 /src
parent55dc6641d0dd7b1326215568abdd7fe65e4725b8 (diff)
parser: use 'redirect to PORT' instead of 'redirect :PORT'
Small syntax update suggested by Patrick. Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
-rw-r--r--src/parser_bison.y5
-rw-r--r--src/scanner.l1
-rw-r--r--src/statement.c2
3 files changed, 5 insertions, 3 deletions
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
{
$<stmt>0->redir.proto = $2;
}
@@ -1447,7 +1448,7 @@ redir_stmt_arg : COLON expr
{
$<stmt>0->redir.flags = $1;
}
- | COLON expr nf_nat_flags
+ | TO expr nf_nat_flags
{
$<stmt>0->redir.proto = $2;
$<stmt>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);
}