X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fofp-print.c;h=7b5e456fd8f58c1a7a689713672237d0fa140ed6;hb=e896c2d42dbb84d1e29504b0b1ed5449f007dea5;hp=5b04d19234a5b1442087f1b8bc7460c4fb082c20;hpb=6c1491fbd75754d2e4d5028650554f9d5d3a4958;p=openvswitch diff --git a/lib/ofp-print.c b/lib/ofp-print.c index 5b04d192..7b5e456f 100644 --- a/lib/ofp-print.c +++ b/lib/ofp-print.c @@ -123,7 +123,7 @@ ofp_print_packet_in(struct ds *string, const struct ofp_packet_in *op, data_len = len - offsetof(struct ofp_packet_in, data); ds_put_format(string, " data_len=%zu", data_len); - if (htonl(op->buffer_id) == UINT32_MAX) { + if (op->buffer_id == htonl(UINT32_MAX)) { ds_put_format(string, " (unbuffered)"); if (ntohs(op->total_len) != data_len) ds_put_format(string, " (***total_len != data_len***)"); @@ -210,8 +210,7 @@ nx_action_len(enum nx_action_subtype subtype) case NXAST_SNAT__OBSOLETE: return -1; case NXAST_RESUBMIT: return sizeof(struct nx_action_resubmit); case NXAST_SET_TUNNEL: return sizeof(struct nx_action_set_tunnel); - case NXAST_DROP_SPOOFED_ARP: - return sizeof(struct nx_action_drop_spoofed_arp); + case NXAST_DROP_SPOOFED_ARP__OBSOLETE: return -1; case NXAST_SET_QUEUE: return sizeof(struct nx_action_set_queue); case NXAST_POP_QUEUE: return sizeof(struct nx_action_pop_queue); case NXAST_REG_MOVE: return sizeof(struct nx_action_reg_move); @@ -259,10 +258,6 @@ ofp_print_nx_action(struct ds *string, const struct nx_action_header *nah) ds_put_format(string, "set_tunnel:%#"PRIx32, ntohl(nast->tun_id)); return; - case NXAST_DROP_SPOOFED_ARP: - ds_put_cstr(string, "drop_spoofed_arp"); - return; - case NXAST_SET_QUEUE: nasq = (struct nx_action_set_queue *)nah; ds_put_format(string, "set_queue:%u", ntohl(nasq->queue_id)); @@ -307,6 +302,7 @@ ofp_print_nx_action(struct ds *string, const struct nx_action_header *nah) return; case NXAST_SNAT__OBSOLETE: + case NXAST_DROP_SPOOFED_ARP__OBSOLETE: default: break; } @@ -780,9 +776,6 @@ ofp_match_to_string(const struct ofp_match *om, int verbosity) skip_type = false; } } - if (w & NXFW_TUN_ID) { - ds_put_cstr(&f, "tun_id_wild,"); - } print_wild(&f, "in_port=", w & OFPFW_IN_PORT, verbosity, "%d", ntohs(om->in_port)); print_wild(&f, "dl_vlan=", w & OFPFW_DL_VLAN, verbosity, @@ -837,7 +830,7 @@ ofp_print_flow_mod(struct ds *s, const struct ofp_header *oh, bool need_priority; int error; - error = ofputil_decode_flow_mod(&fm, oh, NXFF_OPENFLOW10, true); + error = ofputil_decode_flow_mod(&fm, oh, true); if (error) { ofp_print_error(s, error); return; @@ -864,7 +857,7 @@ ofp_print_flow_mod(struct ds *s, const struct ofp_header *oh, ds_put_format(s, "cmd:%d", fm.command); } if (fm.table_id != 0) { - ds_put_format(s, " table_id:%d", fm.table_id); + ds_put_format(s, " table:%d", fm.table_id); } ds_put_char(s, ' '); @@ -937,7 +930,7 @@ ofp_print_flow_removed(struct ds *string, const struct ofp_header *oh) struct ofputil_flow_removed fr; int error; - error = ofputil_decode_flow_removed(&fr, oh, NXFF_OPENFLOW10); + error = ofputil_decode_flow_removed(&fr, oh); if (error) { ofp_print_error(string, error); return; @@ -1050,10 +1043,8 @@ ofp_print_port_status(struct ds *string, const struct ofp_port_status *ops) } static void -ofp_print_ofpst_desc_reply(struct ds *string, const struct ofp_header *oh) +ofp_print_ofpst_desc_reply(struct ds *string, const struct ofp_desc_stats *ods) { - const struct ofp_desc_stats *ods = ofputil_stats_body(oh); - ds_put_char(string, '\n'); ds_put_format(string, "Manufacturer: %.*s\n", (int) sizeof ods->mfr_desc, ods->mfr_desc); @@ -1068,19 +1059,20 @@ ofp_print_ofpst_desc_reply(struct ds *string, const struct ofp_header *oh) } static void -ofp_print_flow_stats_request(struct ds *string, const struct ofp_header *oh) +ofp_print_flow_stats_request(struct ds *string, + const struct ofp_stats_msg *osm) { struct flow_stats_request fsr; int error; - error = ofputil_decode_flow_stats_request(&fsr, oh, NXFF_OPENFLOW10); + error = ofputil_decode_flow_stats_request(&fsr, &osm->header); if (error) { ofp_print_error(string, error); return; } if (fsr.table_id != 0xff) { - ds_put_format(string, " table_id=%"PRIu8, fsr.table_id); + ds_put_format(string, " table=%"PRIu8, fsr.table_id); } if (fsr.out_port != OFPP_NONE) { @@ -1106,7 +1098,7 @@ ofp_print_flow_stats_reply(struct ds *string, const struct ofp_header *oh) struct ofputil_flow_stats fs; int retval; - retval = ofputil_decode_flow_stats_reply(&fs, &b, NXFF_OPENFLOW10); + retval = ofputil_decode_flow_stats_reply(&fs, &b); if (retval) { if (retval != EOF) { ds_put_cstr(string, " ***parse error***"); @@ -1119,7 +1111,7 @@ ofp_print_flow_stats_reply(struct ds *string, const struct ofp_header *oh) ds_put_format(string, " cookie=0x%"PRIx64", duration=", ntohll(fs.cookie)); ofp_print_duration(string, fs.duration_sec, fs.duration_nsec); - ds_put_format(string, ", table_id=%"PRIu8", ", fs.table_id); + ds_put_format(string, ", table=%"PRIu8", ", fs.table_id); ds_put_format(string, "n_packets=%"PRIu64", ", fs.packet_count); ds_put_format(string, "n_bytes=%"PRIu64", ", fs.byte_count); if (fs.idle_timeout != OFP_FLOW_PERMANENT) { @@ -1138,8 +1130,8 @@ ofp_print_flow_stats_reply(struct ds *string, const struct ofp_header *oh) } static void -ofp_print_ofp_aggregate_stats_reply ( - struct ds *string, const struct ofp_aggregate_stats_reply *asr) +ofp_print_ofpst_aggregate_reply(struct ds *string, + const struct ofp_aggregate_stats_reply *asr) { ds_put_format(string, " packet_count=%"PRIu64, ntohll(get_32aligned_be64(&asr->packet_count))); @@ -1148,17 +1140,13 @@ ofp_print_ofp_aggregate_stats_reply ( ds_put_format(string, " flow_count=%"PRIu32, ntohl(asr->flow_count)); } -static void -ofp_print_ofpst_aggregate_reply(struct ds *string, const struct ofp_header *oh) -{ - ofp_print_ofp_aggregate_stats_reply(string, ofputil_stats_body(oh)); -} - static void ofp_print_nxst_aggregate_reply(struct ds *string, const struct nx_aggregate_stats_reply *nasr) { - ofp_print_ofp_aggregate_stats_reply(string, &nasr->asr); + ds_put_format(string, " packet_count=%"PRIu64, ntohll(nasr->packet_count)); + ds_put_format(string, " byte_count=%"PRIu64, ntohll(nasr->byte_count)); + ds_put_format(string, " flow_count=%"PRIu32, ntohl(nasr->flow_count)); } static void print_port_stat(struct ds *string, const char *leader, @@ -1180,9 +1168,9 @@ static void print_port_stat(struct ds *string, const char *leader, } static void -ofp_print_ofpst_port_request(struct ds *string, const struct ofp_header *oh) +ofp_print_ofpst_port_request(struct ds *string, + const struct ofp_port_stats_request *psr) { - const struct ofp_port_stats_request *psr = ofputil_stats_body(oh); ds_put_format(string, " port_no=%"PRIu16, ntohs(psr->port_no)); } @@ -1256,10 +1244,9 @@ ofp_print_queue_name(struct ds *string, uint32_t queue_id) } static void -ofp_print_ofpst_queue_request(struct ds *string, const struct ofp_header *oh) +ofp_print_ofpst_queue_request(struct ds *string, + const struct ofp_queue_stats_request *qsr) { - const struct ofp_queue_stats_request *qsr = ofputil_stats_body(oh); - ds_put_cstr(string, "port="); ofp_print_port_name(string, ntohs(qsr->port_no)); @@ -1294,8 +1281,7 @@ ofp_print_ofpst_queue_reply(struct ds *string, const struct ofp_header *oh, static void ofp_print_stats_request(struct ds *string, const struct ofp_header *oh) { - const struct ofp_stats_request *srq - = (const struct ofp_stats_request *) oh; + const struct ofp_stats_msg *srq = (const struct ofp_stats_msg *) oh; if (srq->flags) { ds_put_format(string, " ***unknown flags 0x%04"PRIx16"***", @@ -1306,7 +1292,7 @@ ofp_print_stats_request(struct ds *string, const struct ofp_header *oh) static void ofp_print_stats_reply(struct ds *string, const struct ofp_header *oh) { - const struct ofp_stats_reply *srp = (const struct ofp_stats_reply *) oh; + const struct ofp_stats_msg *srp = (const struct ofp_stats_msg *) oh; if (srp->flags) { uint16_t flags = ntohs(srp->flags); @@ -1334,13 +1320,6 @@ ofp_print_echo(struct ds *string, const struct ofp_header *oh, int verbosity) } } -static void -ofp_print_nxt_tun_id_from_cookie(struct ds *string, - const struct nxt_tun_id_cookie *ntic) -{ - ds_put_format(string, " set=%"PRIu8, ntic->set); -} - static void ofp_print_nxt_role_message(struct ds *string, const struct nx_role_request *nrr) @@ -1469,7 +1448,7 @@ ofp_to_string__(const struct ofp_header *oh, case OFPUTIL_OFPST_AGGREGATE_REQUEST: case OFPUTIL_NXST_AGGREGATE_REQUEST: ofp_print_stats_request(string, oh); - ofp_print_flow_stats_request(string, oh); + ofp_print_flow_stats_request(string, msg); break; case OFPUTIL_OFPST_TABLE_REQUEST: @@ -1478,17 +1457,17 @@ ofp_to_string__(const struct ofp_header *oh, case OFPUTIL_OFPST_PORT_REQUEST: ofp_print_stats_request(string, oh); - ofp_print_ofpst_port_request(string, oh); + ofp_print_ofpst_port_request(string, msg); break; case OFPUTIL_OFPST_QUEUE_REQUEST: ofp_print_stats_request(string, oh); - ofp_print_ofpst_queue_request(string, oh); + ofp_print_ofpst_queue_request(string, msg); break; case OFPUTIL_OFPST_DESC_REPLY: ofp_print_stats_reply(string, oh); - ofp_print_ofpst_desc_reply(string, oh); + ofp_print_ofpst_desc_reply(string, msg); break; case OFPUTIL_OFPST_FLOW_REPLY: @@ -1514,11 +1493,7 @@ ofp_to_string__(const struct ofp_header *oh, case OFPUTIL_OFPST_AGGREGATE_REPLY: ofp_print_stats_reply(string, oh); - ofp_print_ofpst_aggregate_reply(string, oh); - break; - - case OFPUTIL_NXT_TUN_ID_FROM_COOKIE: - ofp_print_nxt_tun_id_from_cookie(string, msg); + ofp_print_ofpst_aggregate_reply(string, msg); break; case OFPUTIL_NXT_ROLE_REQUEST: