From c93f9a78c349dee759524861a6e80694675283fc Mon Sep 17 00:00:00 2001
From: Ethan Jackson <ethan@nicira.com>
Date: Wed, 6 Jun 2012 15:22:52 -0700
Subject: [PATCH] packets: Update the reserved protocols list.

The protocols added in this patch should be considered "reserved"
and not forward when "forward-bpdu" is false, nor should they be
mirrored.

Bug #11755.
Signed-off-by: Ethan Jackson <ethan@nicira.com>
---
 NEWS                 |  2 ++
 lib/packets.c        | 24 ++++++++++++++++++++++++
 vswitchd/vswitch.xml | 16 ++++++++++++++++
 3 files changed, 42 insertions(+)

diff --git a/NEWS b/NEWS
index ac84edbec..66bf72795 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ post-v1.7.0
     - ovs-ofctl:
         - "mod-port" command can now control all OpenFlow config flags.
     - Added support for arbitrary ethernet masks
+    - Additional protocols are not mirrored and dropped when forward-bpdu is
+      false.  For a full list, see the ovs-vswitchd.conf.db man page.
 
 
 v1.7.0 - xx xxx xxxx
diff --git a/lib/packets.c b/lib/packets.c
index 35829fca8..a8208f598 100644
--- a/lib/packets.c
+++ b/lib/packets.c
@@ -62,6 +62,30 @@ eth_addr_is_reserved(const uint8_t ea[ETH_ADDR_LEN])
             {0x01, 0x08, 0xc2, 0x00, 0x00, 0x00},
             {0xff, 0xff, 0xff, 0xff, 0xff, 0xf0}},
 
+        { /* VRRP IPv4. */
+            {0x00, 0x00, 0x5e, 0x00, 0x01, 0x00},
+            {0xff, 0xff, 0xff, 0xff, 0xff, 0x00}},
+
+        { /* VRRP IPv6. */
+            {0x00, 0x00, 0x5e, 0x00, 0x02, 0x00},
+            {0xff, 0xff, 0xff, 0xff, 0xff, 0x00}},
+
+        { /* HSRPv1. */
+            {0x00, 0x00, 0x0c, 0x07, 0xac, 0x00},
+            {0xff, 0xff, 0xff, 0xff, 0xff, 0x00}},
+
+        { /* HSRPv2. */
+            {0x00, 0x00, 0x0c, 0x9f, 0xf0, 0x00},
+            {0xff, 0xff, 0xff, 0xff, 0xf0, 0x00}},
+
+        { /* GLBP. */
+            {0x00, 0x07, 0xb4, 0x00, 0x00, 0x00},
+            {0xff, 0xff, 0xff, 0x00, 0x00, 0x00}},
+
+        { /* Extreme Discovery Protocol. */
+            {0x00, 0xE0, 0x2B, 0x00, 0x00, 0x00},
+            {0xff, 0xff, 0xff, 0xff, 0xf0, 0x00}},
+
         { /* Cisco Inter Switch Link. */
             {0x01, 0x00, 0x0c, 0x00, 0x00, 0x00},
             {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}},
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 5be9a4fd2..32d4c595b 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -569,6 +569,22 @@
           <dt><code>01:80:c2:00:00:0<var>x</var></code></dt>
           <dd>Other reserved protocols.</dd>
 
+          <dt><code>00:00:5e:00:01:<var>x</var><var>x</var></code></dt>
+          <dd> VRRP IPv4 virtual router MAC address. </dd>
+
+          <dt><code>00:00:5e:00:02:<var>x</var><var>x</var></code></dt>
+          <dd> VRRP IPv6 virtual router MAC address. </dd>
+
+          <dt><code>00:00:0c:07:ac:<var>x</var><var>x</var></code></dt>
+          <dd> HSRP Version 1. </dd>
+
+          <dt><code>00:00:0c:9f:f<var>x</var>:<var>x</var><var>x</var></code>
+          </dt>
+          <dd> HSRP Version 2. </dd>
+
+          <dt><code>00:07:b4:<var>x</var><var>x</var>:<var>x</var><var>x</var>:<var>x</var><var>x</var></code></dt>
+          <dd> GLBP. </dd>
+
           <dt><code>01:00:0c:cc:cc:cc</code></dt>
           <dd>
             Cisco Discovery Protocol (CDP), VLAN Trunking Protocol (VTP),
-- 
2.43.0