X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fstatus.c;h=a8f522d61097b558866755fce81acd81cd823740;hb=5136ce492c414f377f7be9ae32b259abb9f76580;hp=b2cb93568abc91fc0872fd5bb914f8d8acdf6f7e;hpb=e8b52a913a8fc3d2ef0dae82eda5905668ebfae1;p=sliver-openvswitch.git

diff --git a/ofproto/status.c b/ofproto/status.c
index b2cb93568..a8f522d61 100644
--- a/ofproto/status.c
+++ b/ofproto/status.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -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,19 +131,13 @@ static void
 config_status_cb(struct status_reply *sr, void *ofproto_)
 {
     const struct ofproto *ofproto = ofproto_;
-    uint64_t datapath_id, mgmt_id;
+    uint64_t datapath_id;
     struct svec listeners;
-    int probe_interval, max_backoff;
     size_t i;
 
     datapath_id = ofproto_get_datapath_id(ofproto);
     if (datapath_id) {
-        status_reply_put(sr, "datapath-id=%"PRIx64, datapath_id);
-    }
-
-    mgmt_id = ofproto_get_mgmt_id(ofproto);
-    if (mgmt_id) {
-        status_reply_put(sr, "mgmt-id=%"PRIx64, mgmt_id);
+        status_reply_put(sr, "datapath-id=%016"PRIx64, datapath_id);
     }
 
     svec_init(&listeners);
@@ -151,16 +146,6 @@ config_status_cb(struct status_reply *sr, void *ofproto_)
         status_reply_put(sr, "management%zu=%s", i, listeners.names[i]);
     }
     svec_destroy(&listeners);
-
-    probe_interval = ofproto_get_probe_interval(ofproto);
-    if (probe_interval) {
-        status_reply_put(sr, "probe-interval=%d", probe_interval);
-    }
-
-    max_backoff = ofproto_get_max_backoff(ofproto);
-    if (max_backoff) {
-        status_reply_put(sr, "max-backoff=%d", max_backoff);
-    }
 }
 
 static void
@@ -177,7 +162,7 @@ switch_status_cb(struct status_reply *sr, void *ss_)
 struct switch_status *
 switch_status_create(const struct ofproto *ofproto)
 {
-    struct switch_status *ss = xcalloc(1, sizeof *ss);
+    struct switch_status *ss = xzalloc(sizeof *ss);
     ss->booted = time_now();
     list_init(&ss->categories);
     ss->config_cat = switch_status_register(ss, "config", config_status_cb,