Make "controller nl:0" work again, by fixing a layering violation.

The kernel datapath was claiming that it implements STP, which is untrue.
In fact, the secchan implements STP, so if the secchan was not running
the STP support did not work.  Thus, "controller nl:0" would do the
wrong thing.

This makes the secchan edit the responses from the datapath to claim
STP support.

diff --git a/datapath/datapath.c b/datapath/datapath.c
index 598b3470102e30f7070674d43607f21f6588fbd7..83ef565477d36f4921bb13765351731c58719d7e 100644 (file)
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -696,13 +696,6 @@ static void fill_port_desc(struct net_bridge_port *p, struct ofp_phy_port *desc)
        desc->features = 0;
        desc->speed = 0;
 
-       if (p->port_no < 255) {
-               /* FIXME: this is a layering violation and should really be
-                * done in the secchan, as with OFPC_STP in
-                * OFP_SUPPORTED_CAPABILITIES. */
-               desc->features |= OFPPF_STP;
-       }
-
        spin_lock_irqsave(&p->lock, flags);
        desc->flags = htonl(p->flags | p->status);
        spin_unlock_irqrestore(&p->lock, flags);

diff --git a/datapath/datapath.h b/datapath/datapath.h
index 0b26b4a01841e9a7fe301c9ad31aac2c2a31ff32..01fbaae1cd5d951d5242bcbaa69fc433cc3e5448 100644 (file)
--- a/datapath/datapath.h
+++ b/datapath/datapath.h
@@ -24,7 +24,6 @@
 #define OFP_SUPPORTED_CAPABILITIES ( OFPC_FLOW_STATS \
                | OFPC_TABLE_STATS \
                | OFPC_PORT_STATS \
-               | OFPC_STP \
                | OFPC_MULTI_PHY_TX )
 
 /* Actions supported by this implementation. */

diff --git a/secchan/secchan.c b/secchan/secchan.c
index e2a9585c1e95a192cd30fc407d51b9d81342d1f9..9233f0d1e67aa95bef8582c1323365ecbb4d17d6 100644 (file)
--- a/secchan/secchan.c
+++ b/secchan/secchan.c
@@ -586,13 +586,15 @@ relay_destroy(struct relay *r)
 \f
 /* Port status watcher. */
 
-typedef void port_watcher_cb_func(uint16_t port_no,
+typedef void edit_port_cb_func(struct ofp_phy_port *port, void *aux);
+typedef void port_changed_cb_func(uint16_t port_no,
                                   const struct ofp_phy_port *old,
                                   const struct ofp_phy_port *new,
                                   void *aux);
 
 struct port_watcher_cb {
-    port_watcher_cb_func *function;
+    edit_port_cb_func *edit_port;
+    port_changed_cb_func *port_changed;
     void *aux;
 };
 
@@ -643,14 +645,29 @@ port_no_to_pw_idx(int port_no)
 }
 
 static void
-call_pw_callbacks(struct port_watcher *pw, int port_no,
-                  const struct ofp_phy_port *old,
-                  const struct ofp_phy_port *new)
+call_port_changed_callbacks(struct port_watcher *pw, int port_no,
+                            const struct ofp_phy_port *old,
+                            const struct ofp_phy_port *new)
 {
     if (opp_differs(old, new)) {
         int i;
         for (i = 0; i < pw->n_cbs; i++) {
-            pw->cbs[i].function(port_no, old, new, pw->cbs[i].aux);
+            port_changed_cb_func *port_changed = pw->cbs[i].port_changed;
+            if (port_changed) {
+                (port_changed)(port_no, old, new, pw->cbs[i].aux);
+            }
+        }
+    }
+}
+
+static void
+call_edit_port_callbacks(struct port_watcher *pw, struct ofp_phy_port *p)
+{
+    int i;
+    for (i = 0; i < pw->n_cbs; i++) {
+        edit_port_cb_func *edit_port = pw->cbs[i].edit_port;
+        if (edit_port) {
+            (edit_port)(p, pw->cbs[i].aux); 
         }
     }
 }
@@ -683,7 +700,7 @@ update_phy_port(struct port_watcher *pw, struct ofp_phy_port *opp,
         *pw_opp = *opp;
         sanitize_opp(pw_opp);
     }
-    call_pw_callbacks(pw, port_no, &old, pw_opp);
+    call_port_changed_callbacks(pw, port_no, &old, pw_opp);
 }
 
 static bool
@@ -707,7 +724,9 @@ port_watcher_local_packet_cb(struct relay *r, void *pw_)
         n_ports = ((msg->size - offsetof(struct ofp_switch_features, ports))
                    / sizeof *osf->ports);
         for (i = 0; i < n_ports; i++) {
-            update_phy_port(pw, &osf->ports[i], OFPPR_MOD, seen);
+            struct ofp_phy_port *opp = &osf->ports[i];
+            call_edit_port_callbacks(pw, opp);
+            update_phy_port(pw, opp, OFPPR_MOD, seen);
         }
 
         /* Delete all the ports not included in the message. */
@@ -719,6 +738,7 @@ port_watcher_local_packet_cb(struct relay *r, void *pw_)
     } else if (oh->type == OFPT_PORT_STATUS
                && msg->size >= sizeof(struct ofp_port_status)) {
         struct ofp_port_status *ops = msg->data;
+        call_edit_port_callbacks(pw, &ops->desc);
         update_phy_port(pw, &ops->desc, ops->reason, NULL);
     }
     return false;
@@ -742,7 +762,7 @@ port_watcher_remote_packet_cb(struct relay *r, void *pw_)
                 struct ofp_phy_port old = *pw_opp;
                 pw_opp->flags = ((pw_opp->flags & ~opm->mask)
                                  | (opm->desc.flags & opm->mask));
-                call_pw_callbacks(pw, port_no, &old, pw_opp);
+                call_port_changed_callbacks(pw, port_no, &old, pw_opp);
             }
         }
     }
@@ -827,11 +847,13 @@ log_port_status(uint16_t port_no,
 
 static void
 port_watcher_register_callback(struct port_watcher *pw,
-                               port_watcher_cb_func *function,
+                               edit_port_cb_func *edit_port,
+                               port_changed_cb_func *port_changed,
                                void *aux)
 {
     assert(pw->n_cbs < ARRAY_SIZE(pw->cbs));
-    pw->cbs[pw->n_cbs].function = function;
+    pw->cbs[pw->n_cbs].edit_port = edit_port;
+    pw->cbs[pw->n_cbs].port_changed = port_changed;
     pw->cbs[pw->n_cbs].aux = aux;
     pw->n_cbs++;
 }
@@ -867,7 +889,7 @@ port_watcher_set_flags(struct port_watcher *pw,
 
     /* Update our idea of the flags. */
     p->flags = htonl((ntohl(p->flags) & ~mask) | (flags & mask));
-    call_pw_callbacks(pw, port_no, &old, p);
+    call_port_changed_callbacks(pw, port_no, &old, p);
 
     /* Change the flags in the datapath. */
     opm = make_openflow(sizeof *opm, OFPT_PORT_MOD, &b);
@@ -902,7 +924,7 @@ port_watcher_create(struct rconn *local_rconn, struct rconn *remote_rconn,
     for (i = 0; i < OFPP_MAX; i++) {
         pw->ports[i].port_no = htons(OFPP_NONE);
     }
-    port_watcher_register_callback(pw, log_port_status, NULL);
+    port_watcher_register_callback(pw, NULL, log_port_status, NULL);
     return make_hook(port_watcher_local_packet_cb,
                      port_watcher_remote_packet_cb,
                      port_watcher_periodic_cb, NULL, pw);
@@ -927,6 +949,8 @@ struct stp_data {
 static bool
 stp_local_packet_cb(struct relay *r, void *stp_)
 {
+    struct ofpbuf *msg = r->halves[HALF_LOCAL].rxbuf;
+    struct ofp_header *oh;
     struct stp_data *stp = stp_;
     struct ofp_packet_in *opi;
     struct eth_header *eth;
@@ -935,6 +959,14 @@ stp_local_packet_cb(struct relay *r, void *stp_)
     uint16_t port_no;
     struct flow flow;
 
+    oh = msg->data;
+    if (oh->type == OFPT_FEATURES_REPLY
+        && msg->size >= offsetof(struct ofp_switch_features, ports)) {
+        struct ofp_switch_features *osf = msg->data;
+        osf->capabilities |= htonl(OFPC_STP);
+        return false;
+    }
+
     if (!get_ofp_packet_eth_header(r, &opi, &eth)
         || !eth_addr_equals(eth->eth_dst, stp_eth_addr)) {
         return false;
@@ -1082,8 +1114,25 @@ send_bpdu(const void *bpdu, size_t bpdu_size, int port_no, void *stp_)
     rconn_send_with_limit(stp->local_rconn, opo, &stp->n_txq, OFPP_MAX);
 }
 
+static bool
+stp_is_port_supported(uint16_t port_no)
+{
+    /* STP only supports a maximum of 255 ports, one less than OpenFlow.  We
+     * don't support STP on OFPP_LOCAL, either.  */
+    return port_no < STP_MAX_PORTS;
+}
+
+static void
+stp_edit_port_cb(struct ofp_phy_port *p, void *stp_ UNUSED)
+{
+    uint16_t port_no = ntohs(p->port_no);
+    if (stp_is_port_supported(port_no)) {
+        p->features |= htonl(OFPPF_STP);
+    }
+}
+
 static void
-stp_port_watcher_cb(uint16_t port_no,
+stp_port_changed_cb(uint16_t port_no,
                     const struct ofp_phy_port *old,
                     const struct ofp_phy_port *new,
                     void *stp_)
@@ -1091,9 +1140,7 @@ stp_port_watcher_cb(uint16_t port_no,
     struct stp_data *stp = stp_;
     struct stp_port *p;
 
-    /* STP only supports a maximum of 255 ports, one less than OpenFlow.  We
-     * don't support STP on OFPP_LOCAL, either.  */
-    if (port_no >= STP_MAX_PORTS) {
+    if (!stp_is_port_supported(port_no)) {
         return;
     }
 
@@ -1131,7 +1178,8 @@ stp_hook_create(const struct settings *s, struct port_watcher *pw,
     stp->remote_rconn = remote;
     stp->last_tick_256ths = time_256ths();
 
-    port_watcher_register_callback(pw, stp_port_watcher_cb, stp);
+    port_watcher_register_callback(pw, stp_edit_port_cb,
+                                   stp_port_changed_cb, stp);
     return make_hook(stp_local_packet_cb, NULL,
                      stp_periodic_cb, stp_wait_cb, stp);
 }