mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-25 15:07:05 +00:00
Code Issues Releases Wiki Activity

ovs-ofctl: Fix handling of unexpected replies in dump_stats_transaction().

Browse Source 
dump_stats_transaction() ignored errors and other non-stats replies to
its request and would continue to wait forever.  This fixes the problem.

Signed-off-by: Ben Pfaff <blp@nicira.com>
This commit is contained in:
Ben Pfaff
2012-06-11 11:15:31 -07:00
parent 4232ef7755
commit a76150b18b
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
utilities/ovs-ofctl.c
View File

@@ -380,6 +380,7 @@ static void
dump_stats_transaction(const char *vconn_name, struct ofpbuf *request) dump_stats_transaction(const char *vconn_name, struct ofpbuf *request)
{ {
ovs_be32 send_xid = ((struct ofp_header *) request->data)->xid; ovs_be32 send_xid = ((struct ofp_header *) request->data)->xid;
ovs_be16 stats_type = ((struct ofp_stats_msg *) request->data)->type;
struct vconn *vconn; struct vconn *vconn;
bool done = false; bool done = false;
@@ -392,12 +393,21 @@ dump_stats_transaction(const char *vconn_name, struct ofpbuf *request)
run(vconn_recv_block(vconn, &reply), "OpenFlow packet receive failed"); run(vconn_recv_block(vconn, &reply), "OpenFlow packet receive failed");
recv_xid = ((struct ofp_header *) reply->data)->xid; recv_xid = ((struct ofp_header *) reply->data)->xid;
if (send_xid == recv_xid) { if (send_xid == recv_xid) {
struct ofp_stats_msg *osm; const struct ofp_stats_msg *osm = reply->data;
const struct ofp_header *oh = reply->data;
ofp_print(stdout, reply->data, reply->size, verbosity + 1); ofp_print(stdout, reply->data, reply->size, verbosity + 1);
osm = ofpbuf_at(reply, 0, sizeof *osm); if (oh->type == OFPT_ERROR) {
done = !osm || !(ntohs(osm->flags) & OFPSF_REPLY_MORE); done = true;
} else if (oh->type == OFPT10_STATS_REPLY
&& osm->type == stats_type) {
done = !(ntohs(osm->flags) & OFPSF_REPLY_MORE);
} else {
ovs_fatal(0, "received bad reply: %s",
ofp_to_string(reply->data, reply->size,
verbosity + 1));
}
} else { } else {
VLOG_DBG("received reply with xid %08"PRIx32" " VLOG_DBG("received reply with xid %08"PRIx32" "
"!= expected %08"PRIx32, recv_xid, send_xid); "!= expected %08"PRIx32, recv_xid, send_xid);