diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-07-28 20:03:53 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2016-08-18 03:14:57 +0200 |
| commit | 850f0a56b6ad625d6c5d8ba28ec4f55ec02ff2a7 (patch) | |
| tree | 6c6f18f7db5d12ed118ecca86deb40a763aaafa6 /src | |
| parent | 788c986343bc24bd0272e8aa409121ffe51f1ef3 (diff) | |
src: add 'to' for snat and dnat
This is extra syntaxtic sugar to get this consistent with other
statements such as redirect, masquerade, dup and fwd that indicates
where to go.
Existing syntax is still preserved, but the listing shows the one
including 'to'.
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/parser_bison.y | 14 | ||||
| -rw-r--r-- | src/statement.c | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/parser_bison.y b/src/parser_bison.y index e16b8a32..ba2dba41 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -1649,18 +1649,18 @@ stmt_expr : map_stmt_expr | primary_rhs_expr ; -nat_stmt_args : stmt_expr +nat_stmt_args : TO stmt_expr { - $<stmt>0->nat.addr = $1; + $<stmt>0->nat.addr = $2; } - | stmt_expr COLON stmt_expr + | TO stmt_expr COLON stmt_expr { - $<stmt>0->nat.addr = $1; - $<stmt>0->nat.proto = $3; + $<stmt>0->nat.addr = $2; + $<stmt>0->nat.proto = $4; } - | COLON stmt_expr + | TO COLON stmt_expr { - $<stmt>0->nat.proto = $2; + $<stmt>0->nat.proto = $3; } | nat_stmt_args nf_nat_flags { diff --git a/src/statement.c b/src/statement.c index 7778a955..ccc16bb7 100644 --- a/src/statement.c +++ b/src/statement.c @@ -396,7 +396,7 @@ static void nat_stmt_print(const struct stmt *stmt) [NFT_NAT_DNAT] = "dnat", }; - printf("%s ", nat_types[stmt->nat.type]); + printf("%s to ", nat_types[stmt->nat.type]); if (stmt->nat.addr) expr_print(stmt->nat.addr); if (stmt->nat.proto) { |