diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-11-23 15:14:01 +0100 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2017-11-24 15:03:28 +0100 |
| commit | 48661c54357aea271bf87ab2b6ef907eafc97e9a (patch) | |
| tree | 9222b459849f9db7332b71866df33225d9b12920 /tests/shell/testcases/sets | |
| parent | 932847e0c3df8f6ee3dc4478f1ef0728926d9544 (diff) | |
src: deprecate "flow table" syntax, replace it by "meter"
According to bugzilla 1137: "flow tables" should not be syntactically
unique.
"Flow tables are always named, but they don't conform to the way sets,
maps, and dictionaries work in terms of "add" and "delete" and all that.
They are also "flow tables" instead of one word like "flows" or
"throttle" or something.
It seems weird to just have these break the syntactic expectations."
Personally, I never liked the reference to "table" since we have very
specific semantics in terms of what a "table" is netfilter for long
time.
This patch promotes "meter" as the new keyword. The former syntax is
still accepted for a while, just to reduce chances of breaking things.
At some point the former syntax will just be removed.
Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1137
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Acked-by: Arturo Borrero Gonzalez <arturo@netfilter.org>
Diffstat (limited to 'tests/shell/testcases/sets')
| -rwxr-xr-x | tests/shell/testcases/sets/0022type_selective_flush_0 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/shell/testcases/sets/0022type_selective_flush_0 b/tests/shell/testcases/sets/0022type_selective_flush_0 index f8878f70..87a4c7bc 100755 --- a/tests/shell/testcases/sets/0022type_selective_flush_0 +++ b/tests/shell/testcases/sets/0022type_selective_flush_0 @@ -1,7 +1,7 @@ #!/bin/bash # This tests the selectiveness of flush command on structures that use the -# generic set infrastructure (sets, maps and flow tables). +# generic set infrastructure (sets, maps and meters). tmpfile=$(mktemp) if [ ! -w $tmpfile ] ; then @@ -16,7 +16,7 @@ add table t add chain t c add set t s {type ipv4_addr;} add map t m {type ipv4_addr : inet_service;} -add rule t c tcp dport 80 flow table f {ip saddr limit rate 10/second} +add rule t c tcp dport 80 meter name f {ip saddr limit rate 10/second} " >$tmpfile $NFT -f $tmpfile @@ -26,7 +26,7 @@ $NFT -f $tmpfile declare -a cmds=( "flush set t m" "flush set t f" "flush map t s" "flush map t f" - "flush flow table t s" "flush flow table t m" + "flush meter name t s" "flush meter name t m" ) for i in "${cmds[@]}" |