diff options
| author | Florian Westphal <fw@strlen.de> | 2023-09-28 23:27:55 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2023-11-03 12:24:21 +0100 |
| commit | dc36708b9b209823f3ee8912f1d72c272bbd36da (patch) | |
| tree | adfb72a46bd3c3ab2036a210007ea87b0e1cc0a6 /tests/py/bridge/vlan.t | |
| parent | fba8fbeb18225f9d4952fa61fb5a263ae07a26ee (diff) | |
rule: never merge across non-expression statements
commit 99ab1b8feb16741a83fb8b887bacae8fa07d29a2 upstream.
The existing logic can merge across non-expression statements,
if there is only one payload expression.
Example:
ether saddr 00:11:22:33:44:55 counter ether type 8021q
is turned into
counter ether saddr 00:11:22:33:44:55 ether type 8021q
which isn't the same thing.
Fix this up and add test cases for adjacent vlan and ip header
fields. 'Counter' serves as a non-merge fence.
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'tests/py/bridge/vlan.t')
| -rw-r--r-- | tests/py/bridge/vlan.t | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/py/bridge/vlan.t b/tests/py/bridge/vlan.t index 95bdff4f..8fa90dac 100644 --- a/tests/py/bridge/vlan.t +++ b/tests/py/bridge/vlan.t @@ -52,3 +52,5 @@ ether saddr 00:01:02:03:04:05 vlan id 1;ok vlan id 2 ether saddr 0:1:2:3:4:6;ok;ether saddr 00:01:02:03:04:06 vlan id 2 ether saddr . vlan id { 0a:0b:0c:0d:0e:0f . 42, 0a:0b:0c:0d:0e:0f . 4095 };ok + +ether saddr 00:11:22:33:44:55 counter ether type 8021q;ok |