diff options
| author | Patrick McHardy <kaber@trash.net> | 2014-01-16 20:39:20 +0000 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2014-01-16 20:39:20 +0000 |
| commit | 807b936bb3d9bb2c924c742a0548337089494968 (patch) | |
| tree | 61198b487730ad1b434db66ec2f1e002b66d18c2 /src/scanner.l | |
| parent | 0dbced3615ffdbb212ba4f791475a7c65a525309 (diff) | |
| parent | bea7aab38f305bb8c2e400d575e6bd0a3c6bbc1f (diff) | |
Merge remote-tracking branch 'origin/master' into next-3.14
Signed-off-by: Patrick McHardy <kaber@trash.net>
Conflicts:
include/nftables.h
src/main.c
Diffstat (limited to 'src/scanner.l')
| -rw-r--r-- | src/scanner.l | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/scanner.l b/src/scanner.l index 6ff8846b..a0ca7d75 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -221,7 +221,6 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "@" { return AT; } "$" { return '$'; } "=" { return '='; } -"=>" { return ARROW; } "vmap" { return VMAP; } "include" { return INCLUDE; } @@ -258,6 +257,10 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "position" { return POSITION; } +"constant" { return CONSTANT; } +"interval" { return INTERVAL; } +"elements" { return ELEMENTS; } + "counter" { return COUNTER; } "packets" { return PACKETS; } "bytes" { return BYTES; } |