From: Ben Pfaff Date: Tue, 28 May 2013 23:05:34 +0000 (-0700) Subject: packets: Fix typo in reserved multicast Ethernet addresses. X-Git-Tag: sliver-openvswitch-1.10.90-3~6^2~171 X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=f0ac9da9964da2c2c716f1c6c409e59c4cc6ef1d packets: Fix typo in reserved multicast Ethernet addresses. The reserved multicast Ethernet addresses begin with 01:80:c2, not 01:08:c2. Reported-by: Padmanabhan Krishnan Signed-off-by: Ben Pfaff Acked-by: Ethan Jackson --- diff --git a/AUTHORS b/AUTHORS index c0c5a72fd..c88759987 100644 --- a/AUTHORS +++ b/AUTHORS @@ -178,6 +178,7 @@ Min Chen ustcer.tonychan@gmail.com Murphy McCauley murphy.mccauley@gmail.com Mikael Doverhag mdoverhag@nicira.com Niklas Andersson nandersson@nicira.com +Padmanabhan Krishnan kprad1@yahoo.com Pankaj Thakkar thakkar@nicira.com Paul Ingram paul@nicira.com Paulo Cravero pcravero@as2594.net diff --git a/lib/packets.c b/lib/packets.c index 77aa7d38c..7212d0040 100644 --- a/lib/packets.c +++ b/lib/packets.c @@ -59,22 +59,22 @@ eth_addr_is_reserved(const uint8_t ea[ETH_ADDR_LEN]) static struct eth_addr_node nodes[] = { /* STP, IEEE pause frames, and other reserved protocols. */ - { HMAP_NODE_NULL_INITIALIZER, 0x0108c2000000ULL }, - { HMAP_NODE_NULL_INITIALIZER, 0x0108c2000001ULL }, - { HMAP_NODE_NULL_INITIALIZER, 0x0108c2000002ULL }, - { HMAP_NODE_NULL_INITIALIZER, 0x0108c2000003ULL }, - { HMAP_NODE_NULL_INITIALIZER, 0x0108c2000004ULL }, - { HMAP_NODE_NULL_INITIALIZER, 0x0108c2000005ULL }, - { HMAP_NODE_NULL_INITIALIZER, 0x0108c2000006ULL }, - { HMAP_NODE_NULL_INITIALIZER, 0x0108c2000007ULL }, - { HMAP_NODE_NULL_INITIALIZER, 0x0108c2000008ULL }, - { HMAP_NODE_NULL_INITIALIZER, 0x0108c2000009ULL }, - { HMAP_NODE_NULL_INITIALIZER, 0x0108c200000aULL }, - { HMAP_NODE_NULL_INITIALIZER, 0x0108c200000bULL }, - { HMAP_NODE_NULL_INITIALIZER, 0x0108c200000cULL }, - { HMAP_NODE_NULL_INITIALIZER, 0x0108c200000dULL }, - { HMAP_NODE_NULL_INITIALIZER, 0x0108c200000eULL }, - { HMAP_NODE_NULL_INITIALIZER, 0x0108c200000fULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0180c2000000ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0180c2000001ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0180c2000002ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0180c2000003ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0180c2000004ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0180c2000005ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0180c2000006ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0180c2000007ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0180c2000008ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0180c2000009ULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0180c200000aULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0180c200000bULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0180c200000cULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0180c200000dULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0180c200000eULL }, + { HMAP_NODE_NULL_INITIALIZER, 0x0180c200000fULL }, /* Extreme protocols. */ { HMAP_NODE_NULL_INITIALIZER, 0x00e02b000000ULL }, /* EDP. */ diff --git a/tutorial/Tutorial b/tutorial/Tutorial index c537badb4..0506a2075 100644 --- a/tutorial/Tutorial +++ b/tutorial/Tutorial @@ -253,7 +253,7 @@ A switch should also not forward IEEE 802.1D Spanning Tree Protocol packets with reserved multicast protocols: ovs-ofctl add-flow br0 \ - "table=0, dl_dst=01:08:c2:00:00:00/ff:ff:ff:ff:ff:f0, actions=drop" + "table=0, dl_dst=01:80:c2:00:00:00/ff:ff:ff:ff:ff:f0, actions=drop" We could add flows to drop other protocols, but these demonstrate the pattern. @@ -287,12 +287,12 @@ such a flow would be treated as it goes through the switch. Try this command: - ovs-appctl ofproto/trace br0 in_port=1,dl_dst=01:08:c2:00:00:05 + ovs-appctl ofproto/trace br0 in_port=1,dl_dst=01:80:c2:00:00:05 The output should look something like this: - Flow: metadata=0,in_port=1,vlan_tci=0x0000,dl_src=00:00:00:00:00:00,dl_dst=01:08:c2:00:00:05,dl_type=0x0000 - Rule: table=0 cookie=0 dl_dst=01:08:c2:00:00:00/ff:ff:ff:ff:ff:f0 + Flow: metadata=0,in_port=1,vlan_tci=0x0000,dl_src=00:00:00:00:00:00,dl_dst=01:80:c2:00:00:05,dl_type=0x0000 + Rule: table=0 cookie=0 dl_dst=01:80:c2:00:00:00/ff:ff:ff:ff:ff:f0 OpenFlow actions=drop Final flow: unchanged @@ -315,11 +315,11 @@ interesting here. Try another command: - ovs-appctl ofproto/trace br0 in_port=1,dl_dst=01:08:c2:00:00:10 + ovs-appctl ofproto/trace br0 in_port=1,dl_dst=01:80:c2:00:00:10 The output should be: - Flow: metadata=0,in_port=1,vlan_tci=0x0000,dl_src=00:00:00:00:00:00,dl_dst=01:08:c2:00:00:10,dl_type=0x0000 + Flow: metadata=0,in_port=1,vlan_tci=0x0000,dl_src=00:00:00:00:00:00,dl_dst=01:80:c2:00:00:10,dl_type=0x0000 Rule: table=0 cookie=0 priority=0 OpenFlow actions=resubmit(,1) diff --git a/tutorial/t-stage0 b/tutorial/t-stage0 index 55687ee0f..63db6f071 100755 --- a/tutorial/t-stage0 +++ b/tutorial/t-stage0 @@ -4,6 +4,6 @@ ovs-ofctl add-flow br0 \ "table=0, dl_src=01:00:00:00:00:00/01:00:00:00:00:00, actions=drop" ovs-ofctl add-flow br0 \ - "table=0, dl_dst=01:08:c2:00:00:00/ff:ff:ff:ff:ff:f0, actions=drop" + "table=0, dl_dst=01:80:c2:00:00:00/ff:ff:ff:ff:ff:f0, actions=drop" ovs-ofctl add-flow br0 "table=0, priority=0, actions=resubmit(,1)"