diff options
author | Florian Westphal <fw@strlen.de> | 2015-09-26 01:21:14 +0200 |
---|---|---|
committer | Florian Westphal <fw@strlen.de> | 2015-11-06 15:12:29 +0100 |
commit | 8b53f37c5eab2f5672f78736bfff1ea5a72bf471 (patch) | |
tree | 55147822ca7a32e90e6cf57648511f499fa864f1 /tests/regression | |
parent | afc23cc91a5ac697e79c1fc7682bf670bb72d8f8 (diff) |
rule: don't reorder protocol payload expressions when merging
An instruction like
bridge filter input ip saddr 1.2.3.4 ether saddr a:b:c:d:e:f
is displayed as
unknown unknown 0x1020304 [invalid type] ether saddr 00:0f:54:0c:11:04 ether type ip
.. because the (implicit) 'ether type ip' that is injected before the
network header match gets merged into the ether saddr instruction.
This inverts the merge in case the merge candidate contains
a next header protocol field.
After this change, the rule will be displayed as
bridge filter input ether saddr a:b:c:d:e:f ip saddr 1.2.3.4
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'tests/regression')
0 files changed, 0 insertions, 0 deletions