diff options
| author | Florian Westphal <fw@strlen.de> | 2018-05-29 13:47:11 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2018-05-29 13:48:19 +0200 |
| commit | c2cad53ffc22acf1a600219404c6ea5a9f988c37 (patch) | |
| tree | c08a477318bd377b8eeb0510d9265809c1c60ec4 /tests | |
| parent | 3b101fcbcfe01c04e17c36103fcbbdda93b12863 (diff) | |
meters: do not set a defaut meter size from userspace
doing this breaks with older kernels as it will pick a set without
and update callback.
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/py/ip/flowtable.t | 2 | ||||
| -rw-r--r-- | tests/py/ip/flowtable.t.json | 2 | ||||
| -rw-r--r-- | tests/py/ip/flowtable.t.payload | 2 | ||||
| -rw-r--r-- | tests/py/ip6/flowtable.t | 4 | ||||
| -rw-r--r-- | tests/py/ip6/flowtable.t.json | 4 | ||||
| -rw-r--r-- | tests/py/ip6/flowtable.t.payload | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/tests/py/ip/flowtable.t b/tests/py/ip/flowtable.t index 7a68788a..086c6cf6 100644 --- a/tests/py/ip/flowtable.t +++ b/tests/py/ip/flowtable.t @@ -2,4 +2,4 @@ *ip;test-ip;input -meter xyz { ip saddr timeout 30s counter};ok;meter xyz size 65535 { ip saddr timeout 30s counter} +meter xyz size 8192 { ip saddr timeout 30s counter};ok diff --git a/tests/py/ip/flowtable.t.json b/tests/py/ip/flowtable.t.json index e6fc09f4..ca4b5f61 100644 --- a/tests/py/ip/flowtable.t.json +++ b/tests/py/ip/flowtable.t.json @@ -1,4 +1,4 @@ -# meter xyz { ip saddr timeout 30s counter} +# meter xyz size 8192 { ip saddr timeout 30s counter} [ { "meter": { diff --git a/tests/py/ip/flowtable.t.payload b/tests/py/ip/flowtable.t.payload index 34a58499..c0aad39e 100644 --- a/tests/py/ip/flowtable.t.payload +++ b/tests/py/ip/flowtable.t.payload @@ -1,4 +1,4 @@ -# meter xyz { ip saddr timeout 30s counter} +# meter xyz size 8192 { ip saddr timeout 30s counter} xyz test-ip 31 xyz test-ip 0 ip test-ip input diff --git a/tests/py/ip6/flowtable.t b/tests/py/ip6/flowtable.t index d89e90c3..e58d51bb 100644 --- a/tests/py/ip6/flowtable.t +++ b/tests/py/ip6/flowtable.t @@ -2,5 +2,5 @@ *ip6;test-ip6;input -meter acct_out { meta iif . ip6 saddr timeout 600s counter };ok;meter acct_out size 65535 { iif . ip6 saddr timeout 10m counter} -meter acct_out { ip6 saddr . meta iif timeout 600s counter };ok;meter acct_out size 65535 { ip6 saddr . iif timeout 10m counter} +meter acct_out size 4096 { meta iif . ip6 saddr timeout 600s counter };ok;meter acct_out size 4096 { iif . ip6 saddr timeout 10m counter } +meter acct_out size 12345 { ip6 saddr . meta iif timeout 600s counter };ok;meter acct_out size 12345 { ip6 saddr . iif timeout 10m counter } diff --git a/tests/py/ip6/flowtable.t.json b/tests/py/ip6/flowtable.t.json index f707ae9a..e3d05339 100644 --- a/tests/py/ip6/flowtable.t.json +++ b/tests/py/ip6/flowtable.t.json @@ -1,4 +1,4 @@ -# meter acct_out { meta iif . ip6 saddr timeout 600s counter } +# meter acct_out size 4096 { meta iif . ip6 saddr timeout 600s counter } [ { "meter": { @@ -28,7 +28,7 @@ } ] -# meter acct_out { ip6 saddr . meta iif timeout 600s counter } +# meter acct_out size 12345 { ip6 saddr . meta iif timeout 600s counter } [ { "meter": { diff --git a/tests/py/ip6/flowtable.t.payload b/tests/py/ip6/flowtable.t.payload index a3f71b13..559475f6 100644 --- a/tests/py/ip6/flowtable.t.payload +++ b/tests/py/ip6/flowtable.t.payload @@ -1,4 +1,4 @@ -# meter acct_out { meta iif . ip6 saddr timeout 600s counter } +# meter acct_out size 4096 { meta iif . ip6 saddr timeout 600s counter } acct_out test-ip6 31 acct_out test-ip6 0 ip6 test-ip6 input @@ -6,7 +6,7 @@ ip6 test-ip6 input [ payload load 16b @ network header + 8 => reg 9 ] [ dynset update reg_key 1 set acct_out timeout 600000ms expr [ counter pkts 0 bytes 0 ] ] -# meter acct_out { ip6 saddr . meta iif timeout 600s counter } +# meter acct_out size 12345 { ip6 saddr . meta iif timeout 600s counter } acct_out test-ip6 31 acct_out test-ip6 0 ip6 test-ip6 input |