diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-08-18 01:07:24 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2015-08-18 01:10:04 +0200 |
| commit | 94002b41384890224bfb14d1b0986bd8b279b17e (patch) | |
| tree | 98183db74a84036831c6c626df993eaa48e5025c /src/scanner.l | |
| parent | ecf855b2f58f1718a6a1c3dcde13b140557844ec (diff) | |
| parent | 6c43069e5f2a55d769ec6d362bc863af906591d0 (diff) | |
Merge branch 'next-4.2'
This branch adds support for the new 'netdev' family. This also resolves a
simple conflict with the default chain policy printing.
Conflicts:
src/rule.c
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'src/scanner.l')
| -rw-r--r-- | src/scanner.l | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/scanner.l b/src/scanner.l index 985ea2a3..2d9871d0 100644 --- a/src/scanner.l +++ b/src/scanner.l @@ -233,6 +233,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "describe" { return DESCRIBE; } "hook" { return HOOK; } +"device" { return DEVICE; } "table" { return TABLE; } "tables" { return TABLES; } "chain" { return CHAIN; } @@ -255,6 +256,7 @@ addrstring ({macaddr}|{ip4addr}|{ip6addr}) "to" { return TO; } "inet" { return INET; } +"netdev" { return NETDEV; } "add" { return ADD; } "update" { return UPDATE; } |