From ea046380431f5cc623daf8c9d7b2c5438a90a84f Mon Sep 17 00:00:00 2001 From: Florian Westphal Date: Tue, 18 Jun 2019 20:43:57 +0200 Subject: netlink_delinerize: remove network header dep for reject statement also in bridge family add rule bridge test-bridge input reject with icmp type ... is shown as ether type ip reject type ... i.e., the dependency is not removed. Allow dependency removal -- this adds a problem where some icmp types will be shortened to 'reject', losing the icmp ipv4 dependency. Next patch resolves this problem by disabling short-hand abbreviations for bridge reject statements. Signed-off-by: Florian Westphal Acked-by: Pablo Neira Ayuso --- tests/py/bridge/ether.t.json.output | 48 ++++--------------------------------- 1 file changed, 4 insertions(+), 44 deletions(-) (limited to 'tests/py/bridge/ether.t.json.output') diff --git a/tests/py/bridge/ether.t.json.output b/tests/py/bridge/ether.t.json.output index 05e568f6..5bb2e47a 100644 --- a/tests/py/bridge/ether.t.json.output +++ b/tests/py/bridge/ether.t.json.output @@ -8,22 +8,10 @@ "protocol": "tcp" } }, - "op": "==", + "op": "==", "right": 22 } }, - { - "match": { - "left": { - "payload": { - "field": "saddr", - "protocol": "ether" - } - }, - "op": "==", - "right": "00:0f:54:0c:11:04" - } - }, { "match": { "left": { @@ -32,29 +20,10 @@ "protocol": "ip" } }, - "op": "==", + "op": "==", "right": "1.2.3.4" } }, - { - "accept": null - } -] - -# tcp dport 22 ip daddr 1.2.3.4 ether saddr 00:0f:54:0c:11:04 -[ - { - "match": { - "left": { - "payload": { - "field": "dport", - "protocol": "tcp" - } - }, - "op": "==", - "right": 22 - } - }, { "match": { "left": { @@ -63,21 +32,12 @@ "protocol": "ether" } }, - "op": "==", + "op": "==", "right": "00:0f:54:0c:11:04" } }, { - "match": { - "left": { - "payload": { - "field": "daddr", - "protocol": "ip" - } - }, - "op": "==", - "right": "1.2.3.4" - } + "accept": null } ] -- cgit v1.2.3