projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hmap: New function hmap_clear().
[openvswitch]
/
ofproto
/
status.c
diff --git
a/ofproto/status.c
b/ofproto/status.c
index 7fe23787a943dfdfdfdbd2961c0698d71df87e24..0df9ce3d9d717f002c22dbe338a5fe075ec079c7 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 <unistd.h>
#include "dynamic-string.h"
#include "list.h"
+#include "ofp-util.h"
#include "ofpbuf.h"
#include "ofproto.h"
#include "openflow/nicira-ext.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"
#include "svec.h"
#include "timeval.h"
#include "vconn.h"
-
-#define THIS_MODULE VLM_status
#include "vlog.h"
#include "vlog.h"
+VLOG_DEFINE_THIS_MODULE(status)
+
struct status_category {
struct list node;
char *name;
struct status_category {
struct list node;
char *name;
@@
-100,10
+101,10
@@
rconn_status_cb(struct status_reply *sr, void *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, "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",
+ status_reply_put(sr, "remote-port=%d",
ntohs(rconn_get_remote_port(rconn)));
status_reply_put(sr, "local-ip="IP_FMT, IP_ARGS(&local_ip));
ntohs(rconn_get_remote_port(rconn)));
status_reply_put(sr, "local-ip="IP_FMT, IP_ARGS(&local_ip));
- status_reply_put(sr, "local-port=%d",
+ status_reply_put(sr, "local-port=%d",
ntohs(rconn_get_local_port(rconn)));
}
status_reply_put(sr, "state=%s", rconn_get_state(rconn));
ntohs(rconn_get_local_port(rconn)));
}
status_reply_put(sr, "state=%s", rconn_get_state(rconn));
@@
-131,20
+132,11
@@
config_status_cb(struct status_reply *sr, void *ofproto_)
{
const struct ofproto *ofproto = ofproto_;
uint64_t datapath_id;
{
const struct ofproto *ofproto = ofproto_;
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);
}
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);
}
static void
}
static void