X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ofproto%2Fstatus.c;h=1b13e65cb5d8ba7f9941165dc00f65b1a1e85c70;hb=25c269efadb6a7f7f00d8a1ee66104041481299d;hp=b2cb93568abc91fc0872fd5bb914f8d8acdf6f7e;hpb=1d87357a1322c2faa290452c08c7f794c0be848b;p=openvswitch diff --git a/ofproto/status.c b/ofproto/status.c index b2cb9356..1b13e65c 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. @@ -130,7 +130,7 @@ 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; @@ -140,11 +140,6 @@ config_status_cb(struct status_reply *sr, void *ofproto_) 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); - } - svec_init(&listeners); ofproto_get_listeners(ofproto, &listeners); for (i = 0; i < listeners.n; i++) { @@ -177,7 +172,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,