diff options
| -rw-r--r-- | src/parser_bison.y | 5 | ||||
| -rw-r--r-- | tests/py/any/limit.t | 5 | ||||
| -rw-r--r-- | tests/py/any/limit.t.json | 39 | ||||
| -rw-r--r-- | tests/py/any/limit.t.payload | 13 |
4 files changed, 62 insertions, 0 deletions
diff --git a/src/parser_bison.y b/src/parser_bison.y index cf1e139d..65fd35a3 100644 --- a/src/parser_bison.y +++ b/src/parser_bison.y @@ -3268,6 +3268,11 @@ limit_rate_bytes : NUM STRING $$.rate = rate * $1; $$.unit = unit; } + | limit_bytes SLASH time_unit + { + $$.rate = $1; + $$.unit = $3; + } ; limit_bytes : NUM BYTES { $$ = $1; } diff --git a/tests/py/any/limit.t b/tests/py/any/limit.t index 0110e77f..86e8d430 100644 --- a/tests/py/any/limit.t +++ b/tests/py/any/limit.t @@ -25,6 +25,11 @@ limit rate 10230 mbytes/second;ok limit rate 1023000 mbytes/second;ok limit rate 512 kbytes/second burst 5 packets;fail +limit rate 1 bytes / second;ok;limit rate 1 bytes/second +limit rate 1 kbytes / second;ok;limit rate 1 kbytes/second +limit rate 1 mbytes / second;ok;limit rate 1 mbytes/second +limit rate 1 gbytes / second;fail + limit rate 1025 bytes/second burst 512 bytes;ok limit rate 1025 kbytes/second burst 1023 kbytes;ok limit rate 1025 mbytes/second burst 1025 kbytes;ok diff --git a/tests/py/any/limit.t.json b/tests/py/any/limit.t.json index 8bab7e3d..b41ae60a 100644 --- a/tests/py/any/limit.t.json +++ b/tests/py/any/limit.t.json @@ -125,6 +125,45 @@ } ] +# limit rate 1 bytes / second +[ + { + "limit": { + "burst": 5, + "burst_unit": "bytes", + "per": "second", + "rate": 1, + "rate_unit": "bytes" + } + } +] + +# limit rate 1 kbytes / second +[ + { + "limit": { + "burst": 5, + "burst_unit": "bytes", + "per": "second", + "rate": 1, + "rate_unit": "kbytes" + } + } +] + +# limit rate 1 mbytes / second +[ + { + "limit": { + "burst": 5, + "burst_unit": "bytes", + "per": "second", + "rate": 1, + "rate_unit": "mbytes" + } + } +] + # limit rate 1025 bytes/second burst 512 bytes [ { diff --git a/tests/py/any/limit.t.payload b/tests/py/any/limit.t.payload index dc6cea9b..3bd85f4e 100644 --- a/tests/py/any/limit.t.payload +++ b/tests/py/any/limit.t.payload @@ -46,6 +46,19 @@ ip test-ip4 output ip test-ip4 output [ limit rate 1072693248000/second burst 5 type bytes flags 0x0 ] +# limit rate 1 bytes / second +ip + [ limit rate 1/second burst 5 type bytes flags 0x0 ] + +# limit rate 1 kbytes / second +ip + [ limit rate 1024/second burst 5 type bytes flags 0x0 ] + +# limit rate 1 mbytes / second +ip + [ limit rate 1048576/second burst 5 type bytes flags 0x0 ] + + # limit rate 1025 bytes/second burst 512 bytes ip test-ip4 output [ limit rate 1025/second burst 512 type bytes flags 0x0 ] |