From: Ben Pfaff <blp@nicira.com>
Date: Wed, 24 Nov 2010 20:50:52 +0000 (-0800)
Subject: ofproto: Send OFPT_PORT_STATUS messages to primary slave controllers.
X-Git-Tag: v1.1.0~816
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=197a992f4b1a1557e3c6c2822e593d8303e71d85;p=sliver-openvswitch.git

ofproto: Send OFPT_PORT_STATUS messages to primary slave controllers.

Requested-by: Jeremy Stribling <strib@nicira.com>
CC: Jeremy Stribling <strib@nicira.com>
---

diff --git a/include/openflow/nicira-ext.h b/include/openflow/nicira-ext.h
index d87915e21..1a59d3b03 100644
--- a/include/openflow/nicira-ext.h
+++ b/include/openflow/nicira-ext.h
@@ -205,8 +205,8 @@ OFP_ASSERT(sizeof(struct nxt_tun_id_cookie) == 24);
  *      OpenFlow features.  In particular attempts to modify the flow table
  *      will be rejected with an OFPBRC_EPERM error.
  *
- *      Slave controllers also do not receive asynchronous messages
- *      (OFPT_PACKET_IN, OFPT_FLOW_REMOVED, OFPT_PORT_STATUS).
+ *      Slave controllers do not receive OFPT_PACKET_IN or OFPT_FLOW_REMOVED
+ *      messages, but they do receive OFPT_PORT_STATUS messages.
  */
 struct nx_role_request {
     struct nicira_header nxh;
diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index c2b38b2b0..9a4702e9f 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -1515,7 +1515,10 @@ send_port_status(struct ofproto *p, const struct ofport *ofport,
         struct ofp_port_status *ops;
         struct ofpbuf *b;
 
-        if (!ofconn_receives_async_msgs(ofconn)) {
+        /* Primary controllers, even slaves, should always get port status
+           updates.  Otherwise obey ofconn_receives_async_msgs(). */
+        if (ofconn->type != OFCONN_PRIMARY
+            && !ofconn_receives_async_msgs(ofconn)) {
             continue;
         }