summaryrefslogtreecommitdiffstats
path: root/tests/py/bridge/ether.t
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2019-06-18 20:43:59 +0200
committerFlorian Westphal <fw@strlen.de>2019-06-19 22:52:45 +0200
commitfb5a36ad5c1032244cf76171648fdefbbe571519 (patch)
treebf6972f5c6d3be9f5128a337daa649c227ab86c1 /tests/py/bridge/ether.t
parentb65ea148d8f8edc4ef5774154b1aca25d884d500 (diff)
src: prefer meta protocol as bridge l3 dependency
On families other than 'ip', the rule ip protocol icmp needs a dependency on the ip protocol so we do not treat e.g. an ipv6 header as ip. Bridge currently uses eth_hdr.type for this, but that will cause the rule above to not match in case the ip packet is within a VLAN tagged frame -- ether.type will appear as ETH_P_8021Q. Due to vlan tag stripping, skb->protocol will be ETH_P_IP -- so prefer to use this instead. Signed-off-by: Florian Westphal <fw@strlen.de> Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'tests/py/bridge/ether.t')
-rw-r--r--tests/py/bridge/ether.t4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/py/bridge/ether.t b/tests/py/bridge/ether.t
index 15f5f857..e4f75d16 100644
--- a/tests/py/bridge/ether.t
+++ b/tests/py/bridge/ether.t
@@ -2,8 +2,8 @@
*bridge;test-bridge;input
-tcp dport 22 iiftype ether ip daddr 1.2.3.4 ether saddr 00:0f:54:0c:11:4 accept;ok;tcp dport 22 ether saddr 00:0f:54:0c:11:04 ip daddr 1.2.3.4 accept
-tcp dport 22 ip daddr 1.2.3.4 ether saddr 00:0f:54:0c:11:04;ok;tcp dport 22 ether saddr 00:0f:54:0c:11:04 ip daddr 1.2.3.4
+tcp dport 22 iiftype ether ip daddr 1.2.3.4 ether saddr 00:0f:54:0c:11:4 accept;ok;tcp dport 22 ip daddr 1.2.3.4 ether saddr 00:0f:54:0c:11:04 accept
+tcp dport 22 ip daddr 1.2.3.4 ether saddr 00:0f:54:0c:11:04;ok
tcp dport 22 ether saddr 00:0f:54:0c:11:04 ip daddr 1.2.3.4;ok
ether saddr 00:0f:54:0c:11:04 ip daddr 1.2.3.4 accept;ok