/*
- * 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.
#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 "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;
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",
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);
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