From: Ben Pfaff <blp@nicira.com>
Date: Thu, 27 May 2010 16:34:23 +0000 (-0700)
Subject: ofproto: Fix treatment of out-of-band controllers.
X-Git-Tag: v1.0.1~13
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=487ec65f157060b83ee050dc516ddd792574543b;p=sliver-openvswitch.git

ofproto: Fix treatment of out-of-band controllers.

This code was treated every controller as in-band, but obviously that's not
correct.

Reported-by: Jan Medved <jmedved@juniper.net>
---

diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c
index 069d5e518..d8215a85d 100644
--- a/ofproto/ofproto.c
+++ b/ofproto/ofproto.c
@@ -546,6 +546,10 @@ update_in_band_remotes(struct ofproto *ofproto)
     HMAP_FOR_EACH (ofconn, struct ofconn, hmap_node, &ofproto->controllers) {
         struct sockaddr_in *sin = &addrs[n_addrs];
 
+        if (ofconn->band == OFPROTO_OUT_OF_BAND) {
+            continue;
+        }
+
         sin->sin_addr.s_addr = rconn_get_remote_ip(ofconn->rconn);
         if (sin->sin_addr.s_addr) {
             sin->sin_port = rconn_get_remote_port(ofconn->rconn);