datapath: Handle duplicate netdev in netdev_rx_handler_register()

[openvswitch] / ofproto / status.c

diff --git a/ofproto/status.c b/ofproto/status.c
index dbedf10e018fa2432103dd4c9d5dfa510ce62b5e..644e3a45ff7da9b20a7f5cfbfbc8aa0843614061 100644 (file)
--- a/ofproto/status.c
+++ b/ofproto/status.c
@@ -24,6 +24,7 @@
 #include <unistd.h>
 #include "dynamic-string.h"
 #include "list.h"
+#include "ofp-util.h"
 #include "ofpbuf.h"
 #include "ofproto.h"
 #include "openflow/nicira-ext.h"
@@ -32,10 +33,10 @@
 #include "svec.h"
 #include "timeval.h"
 #include "vconn.h"
-
-#define THIS_MODULE VLM_status
 #include "vlog.h"
 
+VLOG_DEFINE_THIS_MODULE(status)
+
 struct status_category {
     struct list node;
     char *name;
@@ -97,7 +98,7 @@ rconn_status_cb(struct status_reply *sr, void *rconn_)
     uint32_t remote_ip = rconn_get_remote_ip(rconn);
     uint32_t local_ip = rconn_get_local_ip(rconn);
 
-    status_reply_put(sr, "name=%s", rconn_get_name(rconn));
+    status_reply_put(sr, "name=%s", rconn_get_target(rconn));
     if (remote_ip) {
         status_reply_put(sr, "remote-ip="IP_FMT, IP_ARGS(&remote_ip));
         status_reply_put(sr, "remote-port=%d", 
@@ -130,30 +131,12 @@ static void
 config_status_cb(struct status_reply *sr, void *ofproto_)
 {
     const struct ofproto *ofproto = ofproto_;
-    struct ofproto_controller controller;
     uint64_t datapath_id;
-    struct svec listeners;
-    size_t i;
 
     datapath_id = ofproto_get_datapath_id(ofproto);
     if (datapath_id) {
         status_reply_put(sr, "datapath-id=%016"PRIx64, datapath_id);
     }
-
-    svec_init(&listeners);
-    ofproto_get_listeners(ofproto, &listeners);
-    for (i = 0; i < listeners.n; i++) {
-        status_reply_put(sr, "management%zu=%s", i, listeners.names[i]);
-    }
-    svec_destroy(&listeners);
-
-    ofproto_get_controller(ofproto, &controller);
-    if (controller.probe_interval) {
-        status_reply_put(sr, "probe-interval=%d", controller.probe_interval);
-    }
-    if (controller.max_backoff) {
-        status_reply_put(sr, "max-backoff=%d", controller.max_backoff);
-    }
 }
 
 static void