X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ofproto%2Fstatus.c;h=e4834d84b862821a3835330afcd38e67b466c269;hb=8497dd41214ddaac26928f2efa90becd1b336a52;hp=a8f522d61097b558866755fce81acd81cd823740;hpb=5136ce492c414f377f7be9ae32b259abb9f76580;p=openvswitch diff --git a/ofproto/status.c b/ofproto/status.c index a8f522d6..e4834d84 100644 --- a/ofproto/status.c +++ b/ofproto/status.c @@ -70,7 +70,7 @@ switch_status_handle_request(struct switch_status *ss, struct rconn *rconn, sr.request.string = (void *) (request + 1); sr.request.length = ntohs(request->header.length) - sizeof *request; ds_init(&sr.output); - LIST_FOR_EACH (c, struct status_category, node, &ss->categories) { + LIST_FOR_EACH (c, node, &ss->categories) { if (!memcmp(c->name, sr.request.string, MIN(strlen(c->name), sr.request.length))) { sr.category = c; @@ -101,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, "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)); - 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)); @@ -132,20 +132,11 @@ config_status_cb(struct status_reply *sr, void *ofproto_) { 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); } - - 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 @@ -179,8 +170,7 @@ switch_status_destroy(struct switch_status *ss) /* Orphan any remaining categories, so that unregistering them later * won't write to bad memory. */ struct status_category *c, *next; - LIST_FOR_EACH_SAFE (c, next, - struct status_category, node, &ss->categories) { + LIST_FOR_EACH_SAFE (c, next, node, &ss->categories) { list_init(&c->node); } switch_status_unregister(ss->config_cat);