X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofp-print.c;h=a0f04dcb64634d734e06029a92149f553d56d692;hb=72e8bf28bb38e8816435c64859fb350215b6a9e6;hp=48b8daa964570c52e3a0c3e894c1bdb9e727def7;hpb=2b07c8b182b76e4e3a162796d3ae273ef51d4131;p=sliver-openvswitch.git diff --git a/lib/ofp-print.c b/lib/ofp-print.c index 48b8daa96..a0f04dcb6 100644 --- a/lib/ofp-print.c +++ b/lib/ofp-print.c @@ -38,6 +38,7 @@ #include "nx-match.h" #include "ofp-actions.h" #include "ofp-errors.h" +#include "ofp-msgs.h" #include "ofp-util.h" #include "ofpbuf.h" #include "openflow/openflow.h" @@ -62,7 +63,7 @@ ofp_packet_to_string(const void *data, size_t len) struct flow flow; ofpbuf_use_const(&buf, data, len); - flow_extract(&buf, 0, 0, 0, &flow); + flow_extract(&buf, 0, 0, NULL, 0, &flow); flow_format(&ds, &flow); if (buf.l7) { @@ -107,26 +108,17 @@ ofp_print_packet_in(struct ds *string, const struct ofp_header *oh, ds_put_format(string, " total_len=%"PRIu16" in_port=", pin.total_len); ofputil_format_port(pin.fmd.in_port, string); - if (pin.fmd.tun_id_mask) { + if (pin.fmd.tun_id != htonll(0)) { ds_put_format(string, " tun_id=0x%"PRIx64, ntohll(pin.fmd.tun_id)); - if (pin.fmd.tun_id_mask != htonll(UINT64_MAX)) { - ds_put_format(string, "/0x%"PRIx64, ntohll(pin.fmd.tun_id_mask)); - } } - if (pin.fmd.metadata_mask) { + if (pin.fmd.metadata != htonll(0)) { ds_put_format(string, " metadata=0x%"PRIx64, ntohll(pin.fmd.metadata)); - if (pin.fmd.metadata_mask != htonll(UINT64_MAX)) { - ds_put_format(string, "/0x%"PRIx64, ntohll(pin.fmd.metadata_mask)); - } } for (i = 0; i < FLOW_N_REGS; i++) { - if (pin.fmd.reg_masks[i]) { + if (pin.fmd.regs[i]) { ds_put_format(string, " reg%d=0x%"PRIx32, i, pin.fmd.regs[i]); - if (pin.fmd.reg_masks[i] != UINT32_MAX) { - ds_put_format(string, "/0x%"PRIx32, pin.fmd.reg_masks[i]); - } } } @@ -155,7 +147,7 @@ ofp_print_packet_in(struct ds *string, const struct ofp_header *oh, } static void -ofp_print_packet_out(struct ds *string, const struct ofp_packet_out *opo, +ofp_print_packet_out(struct ds *string, const struct ofp_header *oh, int verbosity) { struct ofputil_packet_out po; @@ -163,7 +155,7 @@ ofp_print_packet_out(struct ds *string, const struct ofp_packet_out *opo, enum ofperr error; ofpbuf_init(&ofpacts, 64); - error = ofputil_decode_packet_out(&po, opo, &ofpacts); + error = ofputil_decode_packet_out(&po, oh, &ofpacts); if (error) { ofpbuf_uninit(&ofpacts); ofp_print_error(string, error); @@ -441,6 +433,7 @@ ofputil_capabilities_to_name(uint32_t bit) case OFPUTIL_C_ARP_MATCH_IP: return "ARP_MATCH_IP"; case OFPUTIL_C_STP: return "STP"; case OFPUTIL_C_GROUP_STATS: return "GROUP_STATS"; + case OFPUTIL_C_PORT_BLOCKED: return "PORT_BLOCKED"; } return NULL; @@ -464,6 +457,7 @@ ofputil_action_bitmap_to_name(uint32_t bit) case OFPUTIL_A_SET_NW_TOS: return "SET_NW_TOS"; case OFPUTIL_A_SET_TP_SRC: return "SET_TP_SRC"; case OFPUTIL_A_SET_TP_DST: return "SET_TP_DST"; + case OFPUTIL_A_SET_FIELD: return "SET_FIELD"; case OFPUTIL_A_ENQUEUE: return "ENQUEUE"; case OFPUTIL_A_COPY_TTL_OUT: return "COPY_TTL_OUT"; case OFPUTIL_A_COPY_TTL_IN: return "COPY_TTL_IN"; @@ -485,14 +479,13 @@ ofputil_action_bitmap_to_name(uint32_t bit) } static void -ofp_print_switch_features(struct ds *string, - const struct ofp_switch_features *osf) +ofp_print_switch_features(struct ds *string, const struct ofp_header *oh) { struct ofputil_switch_features features; enum ofperr error; struct ofpbuf b; - error = ofputil_decode_switch_features(osf, &features, &b); + error = ofputil_decode_switch_features(oh, &features, &b); if (error) { ofp_print_error(string, error); return; @@ -507,12 +500,21 @@ ofp_print_switch_features(struct ds *string, ofputil_capabilities_to_name, ' '); ds_put_char(string, '\n'); - ds_put_cstr(string, "actions: "); - ofp_print_bit_names(string, features.actions, - ofputil_action_bitmap_to_name, ' '); - ds_put_char(string, '\n'); + switch ((enum ofp_version)oh->version) { + case OFP10_VERSION: + ds_put_cstr(string, "actions: "); + ofp_print_bit_names(string, features.actions, + ofputil_action_bitmap_to_name, ' '); + ds_put_char(string, '\n'); + break; + case OFP11_VERSION: + case OFP12_VERSION: + break; + default: + NOT_REACHED(); + } - ofp_print_phy_ports(string, osf->header.version, &b); + ofp_print_phy_ports(string, oh->version, &b); } static void @@ -615,6 +617,8 @@ ofp10_match_to_string(const struct ofp10_match *om, int verbosity) } } else if (om->dl_type == htons(ETH_TYPE_ARP)) { ds_put_cstr(&f, "arp,"); + } else if (om->dl_type == htons(ETH_TYPE_RARP)){ + ds_put_cstr(&f, "rarp,"); } else { skip_type = false; } @@ -640,7 +644,8 @@ ofp10_match_to_string(const struct ofp10_match *om, int verbosity) (w & OFPFW10_NW_DST_MASK) >> OFPFW10_NW_DST_SHIFT, verbosity); if (!skip_proto) { - if (om->dl_type == htons(ETH_TYPE_ARP)) { + if (om->dl_type == htons(ETH_TYPE_ARP) || + om->dl_type == htons(ETH_TYPE_RARP)) { print_wild(&f, "arp_op=", w & OFPFW10_NW_PROTO, verbosity, "%u", om->nw_proto); } else { @@ -668,16 +673,20 @@ ofp10_match_to_string(const struct ofp10_match *om, int verbosity) } static void -ofp_print_flow_mod(struct ds *s, const struct ofp_header *oh, - enum ofputil_msg_code code, int verbosity) +ofp_print_flow_mod(struct ds *s, const struct ofp_header *oh, int verbosity) { struct ofputil_flow_mod fm; struct ofpbuf ofpacts; bool need_priority; enum ofperr error; + enum ofpraw raw; + enum ofputil_protocol protocol; + + protocol = ofputil_protocol_from_ofp_version(oh->version); + protocol = ofputil_protocol_set_tid(protocol, true); ofpbuf_init(&ofpacts, 64); - error = ofputil_decode_flow_mod(&fm, oh, OFPUTIL_P_OF10_TID, &ofpacts); + error = ofputil_decode_flow_mod(&fm, oh, protocol, &ofpacts); if (error) { ofpbuf_uninit(&ofpacts); ofp_print_error(s, error); @@ -709,14 +718,15 @@ ofp_print_flow_mod(struct ds *s, const struct ofp_header *oh, } ds_put_char(s, ' '); - if (verbosity >= 3 && code == OFPUTIL_OFPT_FLOW_MOD) { - const struct ofp_flow_mod *ofm = (const struct ofp_flow_mod *) oh; + ofpraw_decode(&raw, oh); + if (verbosity >= 3 && raw == OFPRAW_OFPT10_FLOW_MOD) { + const struct ofp10_flow_mod *ofm = ofpmsg_body(oh); ofp10_match_print(s, &ofm->match, verbosity); /* ofp_print_match() doesn't print priority. */ need_priority = true; - } else if (verbosity >= 3 && code == OFPUTIL_NXT_FLOW_MOD) { - const struct nx_flow_mod *nfm = (const struct nx_flow_mod *) oh; + } else if (verbosity >= 3 && raw == OFPRAW_NXT_FLOW_MOD) { + const struct nx_flow_mod *nfm = ofpmsg_body(oh); const void *nxm = nfm + 1; char *nxm_s; @@ -727,16 +737,16 @@ ofp_print_flow_mod(struct ds *s, const struct ofp_header *oh, /* nx_match_to_string() doesn't print priority. */ need_priority = true; } else { - cls_rule_format(&fm.cr, s); + match_format(&fm.match, s, fm.priority); - /* cls_rule_format() does print priority. */ + /* match_format() does print priority. */ need_priority = false; } if (ds_last(s) != ' ') { ds_put_char(s, ' '); } - if (fm.new_cookie != htonll(0)) { + if (fm.new_cookie != htonll(0) && fm.new_cookie != htonll(UINT64_MAX)) { ds_put_format(s, "cookie:0x%"PRIx64" ", ntohll(fm.new_cookie)); } if (fm.cookie_mask != htonll(0)) { @@ -749,8 +759,8 @@ ofp_print_flow_mod(struct ds *s, const struct ofp_header *oh, if (fm.hard_timeout != OFP_FLOW_PERMANENT) { ds_put_format(s, "hard:%"PRIu16" ", fm.hard_timeout); } - if (fm.cr.priority != OFP_DEFAULT_PRIORITY && need_priority) { - ds_put_format(s, "pri:%"PRIu16" ", fm.cr.priority); + if (fm.priority != OFP_DEFAULT_PRIORITY && need_priority) { + ds_put_format(s, "pri:%"PRIu16" ", fm.priority); } if (fm.buffer_id != UINT32_MAX) { ds_put_format(s, "buf:0x%"PRIx32" ", fm.buffer_id); @@ -769,11 +779,11 @@ ofp_print_flow_mod(struct ds *s, const struct ofp_header *oh, if (flags & OFPFF_CHECK_OVERLAP) { ds_put_cstr(s, "check_overlap "); } - if (flags & OFPFF_EMERG) { + if (flags & OFPFF10_EMERG) { ds_put_cstr(s, "emerg "); } - flags &= ~(OFPFF_SEND_FLOW_REM | OFPFF_CHECK_OVERLAP | OFPFF_EMERG); + flags &= ~(OFPFF_SEND_FLOW_REM | OFPFF_CHECK_OVERLAP | OFPFF10_EMERG); if (flags) { ds_put_format(s, "flags:0x%"PRIx16" ", flags); } @@ -831,18 +841,28 @@ ofp_print_flow_removed(struct ds *string, const struct ofp_header *oh) } ds_put_char(string, ' '); - cls_rule_format(&fr.rule, string); + match_format(&fr.match, string, fr.priority); ds_put_format(string, " reason=%s", ofp_flow_removed_reason_to_string(fr.reason)); + if (fr.table_id != 255) { + ds_put_format(string, " table_id=%"PRIu8, fr.table_id); + } + if (fr.cookie != htonll(0)) { ds_put_format(string, " cookie:0x%"PRIx64, ntohll(fr.cookie)); } ds_put_cstr(string, " duration"); ofp_print_duration(string, fr.duration_sec, fr.duration_nsec); - ds_put_format(string, " idle%"PRIu16" pkts%"PRIu64" bytes%"PRIu64"\n", - fr.idle_timeout, fr.packet_count, fr.byte_count); + ds_put_format(string, " idle%"PRIu16, fr.idle_timeout); + if (fr.hard_timeout) { + /* The hard timeout was only added in OF1.2, so only print it if it is + * actually in use to avoid gratuitous change to the formatting. */ + ds_put_format(string, " hard%"PRIu16, fr.hard_timeout); + } + ds_put_format(string, " pkts%"PRIu64" bytes%"PRIu64"\n", + fr.packet_count, fr.byte_count); } static void @@ -884,41 +904,55 @@ ofp_print_error(struct ds *string, enum ofperr error) } static void -ofp_print_error_msg(struct ds *string, const struct ofp_error_msg *oem) +ofp_print_hello(struct ds *string, const struct ofp_header *oh) { - size_t len = ntohs(oem->header.length); - size_t payload_ofs, payload_len; - const void *payload; + uint32_t allowed_versions; + bool ok; + + ok = ofputil_decode_hello(oh, &allowed_versions); + + ds_put_cstr(string, "\n version bitmap: "); + ofputil_format_version_bitmap(string, allowed_versions); + + if (!ok) { + ds_put_cstr(string, "\n unknown data in hello:\n"); + ds_put_hex_dump(string, oh, ntohs(oh->length), 0, true); + } +} + +static void +ofp_print_error_msg(struct ds *string, const struct ofp_header *oh) +{ + size_t len = ntohs(oh->length); + struct ofpbuf payload; enum ofperr error; char *s; - error = ofperr_decode_msg(&oem->header, &payload_ofs); + error = ofperr_decode_msg(oh, &payload); if (!error) { ds_put_cstr(string, "***decode error***"); - ds_put_hex_dump(string, oem->data, len - sizeof *oem, 0, true); + ds_put_hex_dump(string, oh + 1, len - sizeof *oh, 0, true); return; } ds_put_format(string, " %s\n", ofperr_get_name(error)); - payload = (const uint8_t *) oem + payload_ofs; - payload_len = len - payload_ofs; if (error == OFPERR_OFPHFC_INCOMPATIBLE || error == OFPERR_OFPHFC_EPERM) { - ds_put_printable(string, payload, payload_len); + ds_put_printable(string, payload.data, payload.size); } else { - s = ofp_to_string(payload, payload_len, 1); + s = ofp_to_string(payload.data, payload.size, 1); ds_put_cstr(string, s); free(s); } } static void -ofp_print_port_status(struct ds *string, const struct ofp_port_status *ops) +ofp_print_port_status(struct ds *string, const struct ofp_header *oh) { struct ofputil_port_status ps; enum ofperr error; - error = ofputil_decode_port_status(ops, &ps); + error = ofputil_decode_port_status(oh, &ps); if (error) { ofp_print_error(string, error); return; @@ -936,8 +970,10 @@ 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_desc_stats *ods) +ofp_print_ofpst_desc_reply(struct ds *string, const struct ofp_header *oh) { + const struct ofp_desc_stats *ods = ofpmsg_body(oh); + ds_put_char(string, '\n'); ds_put_format(string, "Manufacturer: %.*s\n", (int) sizeof ods->mfr_desc, ods->mfr_desc); @@ -952,13 +988,12 @@ ofp_print_ofpst_desc_reply(struct ds *string, const struct ofp_desc_stats *ods) } static void -ofp_print_flow_stats_request(struct ds *string, - const struct ofp_stats_msg *osm) +ofp_print_flow_stats_request(struct ds *string, const struct ofp_header *oh) { struct ofputil_flow_stats_request fsr; enum ofperr error; - error = ofputil_decode_flow_stats_request(&fsr, &osm->header); + error = ofputil_decode_flow_stats_request(&fsr, oh); if (error) { ofp_print_error(string, error); return; @@ -973,12 +1008,8 @@ ofp_print_flow_stats_request(struct ds *string, ofputil_format_port(fsr.out_port, string); } - /* A flow stats request doesn't include a priority, but cls_rule_format() - * will print one unless it is OFP_DEFAULT_PRIORITY. */ - fsr.match.priority = OFP_DEFAULT_PRIORITY; - ds_put_char(string, ' '); - cls_rule_format(&fsr.match, string); + match_format(&fsr.match, string, OFP_DEFAULT_PRIORITY); } void @@ -1004,7 +1035,7 @@ ofp_print_flow_stats(struct ds *string, struct ofputil_flow_stats *fs) ds_put_format(string, "hard_age=%d, ", fs->hard_age); } - cls_rule_format(&fs->rule, string); + match_format(&fs->match, string, fs->priority); if (string->string[string->length - 1] != ' ') { ds_put_char(string, ' '); } @@ -1034,33 +1065,29 @@ ofp_print_flow_stats_reply(struct ds *string, const struct ofp_header *oh) ds_put_char(string, '\n'); ofp_print_flow_stats(string, &fs); } + ofpbuf_uninit(&ofpacts); } static void -ofp_print_ofpst_aggregate_reply(struct ds *string, - const struct ofp_aggregate_stats_reply *asr) +ofp_print_aggregate_stats_reply(struct ds *string, const struct ofp_header *oh) { - ds_put_format(string, " packet_count=%"PRIu64, - ntohll(get_32aligned_be64(&asr->packet_count))); - ds_put_format(string, " byte_count=%"PRIu64, - ntohll(get_32aligned_be64(&asr->byte_count))); - ds_put_format(string, " flow_count=%"PRIu32, ntohl(asr->flow_count)); -} + struct ofputil_aggregate_stats as; + enum ofperr error; -static void -ofp_print_nxst_aggregate_reply(struct ds *string, - const struct nx_aggregate_stats_reply *nasr) -{ - 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)); + error = ofputil_decode_aggregate_stats_reply(&as, oh); + if (error) { + ofp_print_error(string, error); + return; + } + + ds_put_format(string, " packet_count=%"PRIu64, as.packet_count); + ds_put_format(string, " byte_count=%"PRIu64, as.byte_count); + ds_put_format(string, " flow_count=%"PRIu32, as.flow_count); } -static void print_port_stat(struct ds *string, const char *leader, - const ovs_32aligned_be64 *statp, int more) +static void +print_port_stat(struct ds *string, const char *leader, uint64_t stat, int more) { - uint64_t stat = ntohll(get_32aligned_be64(statp)); - ds_put_cstr(string, leader); if (stat != UINT64_MAX) { ds_put_format(string, "%"PRIu64, stat); @@ -1075,71 +1102,237 @@ static void print_port_stat(struct ds *string, const char *leader, } static void -ofp_print_ofpst_port_request(struct ds *string, - const struct ofp_port_stats_request *psr) +ofp_print_ofpst_port_request(struct ds *string, const struct ofp_header *oh) { - ds_put_format(string, " port_no=%"PRIu16, ntohs(psr->port_no)); + uint16_t ofp10_port; + enum ofperr error; + + error = ofputil_decode_port_stats_request(oh, &ofp10_port); + if (error) { + ofp_print_error(string, error); + return; + } + + ds_put_format(string, " port_no=%2"PRIu16, ofp10_port); } static void ofp_print_ofpst_port_reply(struct ds *string, const struct ofp_header *oh, int verbosity) { - const struct ofp_port_stats *ps = ofputil_stats_body(oh); - size_t n = ofputil_stats_body_len(oh) / sizeof *ps; - ds_put_format(string, " %zu ports\n", n); + struct ofpbuf b; + + ds_put_format(string, " %zu ports\n", ofputil_count_port_stats(oh)); if (verbosity < 1) { return; } - for (; n--; ps++) { - ds_put_format(string, " port %2"PRIu16": ", ntohs(ps->port_no)); + ofpbuf_use_const(&b, oh, ntohs(oh->length)); + for (;;) { + struct ofputil_port_stats ps; + int retval; - ds_put_cstr(string, "rx "); - print_port_stat(string, "pkts=", &ps->rx_packets, 1); - print_port_stat(string, "bytes=", &ps->rx_bytes, 1); - print_port_stat(string, "drop=", &ps->rx_dropped, 1); - print_port_stat(string, "errs=", &ps->rx_errors, 1); - print_port_stat(string, "frame=", &ps->rx_frame_err, 1); - print_port_stat(string, "over=", &ps->rx_over_err, 1); - print_port_stat(string, "crc=", &ps->rx_crc_err, 0); + retval = ofputil_decode_port_stats(&ps, &b); + if (retval) { + if (retval != EOF) { + ds_put_cstr(string, " ***parse error***"); + } + return; + } + + ds_put_format(string, " port %2"PRIu16, ps.port_no); + + ds_put_cstr(string, ": rx "); + print_port_stat(string, "pkts=", ps.stats.rx_packets, 1); + print_port_stat(string, "bytes=", ps.stats.rx_bytes, 1); + print_port_stat(string, "drop=", ps.stats.rx_dropped, 1); + print_port_stat(string, "errs=", ps.stats.rx_errors, 1); + print_port_stat(string, "frame=", ps.stats.rx_frame_errors, 1); + print_port_stat(string, "over=", ps.stats.rx_over_errors, 1); + print_port_stat(string, "crc=", ps.stats.rx_crc_errors, 0); ds_put_cstr(string, " tx "); - print_port_stat(string, "pkts=", &ps->tx_packets, 1); - print_port_stat(string, "bytes=", &ps->tx_bytes, 1); - print_port_stat(string, "drop=", &ps->tx_dropped, 1); - print_port_stat(string, "errs=", &ps->tx_errors, 1); - print_port_stat(string, "coll=", &ps->collisions, 0); + print_port_stat(string, "pkts=", ps.stats.tx_packets, 1); + print_port_stat(string, "bytes=", ps.stats.tx_bytes, 1); + print_port_stat(string, "drop=", ps.stats.tx_dropped, 1); + print_port_stat(string, "errs=", ps.stats.tx_errors, 1); + print_port_stat(string, "coll=", ps.stats.collisions, 0); } } static void -ofp_print_ofpst_table_reply(struct ds *string, const struct ofp_header *oh, - int verbosity) +ofp_print_one_ofpst_table_reply(struct ds *string, enum ofp_version ofp_version, + const char *name, struct ofp12_table_stats *ts) +{ + char name_[OFP_MAX_TABLE_NAME_LEN + 1]; + + ovs_strlcpy(name_, name, sizeof name_); + + ds_put_format(string, " %d: %-8s: ", ts->table_id, name_); + ds_put_format(string, "wild=0x%05"PRIx64", ", ntohll(ts->wildcards)); + ds_put_format(string, "max=%6"PRIu32", ", ntohl(ts->max_entries)); + ds_put_format(string, "active=%"PRIu32"\n", ntohl(ts->active_count)); + ds_put_cstr(string, " "); + ds_put_format(string, "lookup=%"PRIu64", ", ntohll(ts->lookup_count)); + ds_put_format(string, "matched=%"PRIu64"\n", ntohll(ts->matched_count)); + + if (ofp_version < OFP11_VERSION) { + return; + } + + ds_put_cstr(string, " "); + ds_put_format(string, "match=0x%08"PRIx64", ", ntohll(ts->match)); + ds_put_format(string, "instructions=0x%08"PRIx32", ", + ntohl(ts->instructions)); + ds_put_format(string, "config=0x%08"PRIx32"\n", ntohl(ts->config)); + ds_put_cstr(string, " "); + ds_put_format(string, "write_actions=0x%08"PRIx32", ", + ntohl(ts->write_actions)); + ds_put_format(string, "apply_actions=0x%08"PRIx32"\n", + ntohl(ts->apply_actions)); + + if (ofp_version < OFP12_VERSION) { + return; + } + + ds_put_cstr(string, " "); + ds_put_format(string, "write_setfields=0x%016"PRIx64"\n", + ntohll(ts->write_setfields)); + ds_put_cstr(string, " "); + ds_put_format(string, "apply_setfields=0x%016"PRIx64"\n", + ntohll(ts->apply_setfields)); + ds_put_cstr(string, " "); + ds_put_format(string, "metadata_match=0x%016"PRIx64"\n", + ntohll(ts->metadata_match)); + ds_put_cstr(string, " "); + ds_put_format(string, "metadata_write=0x%016"PRIx64"\n", + ntohll(ts->metadata_write)); +} + +static void +ofp_print_ofpst_table_reply12(struct ds *string, const struct ofp_header *oh, + int verbosity) +{ + struct ofp12_table_stats *ts; + struct ofpbuf b; + size_t n; + + ofpbuf_use_const(&b, oh, ntohs(oh->length)); + ofpraw_pull_assert(&b); + + n = b.size / sizeof *ts; + ds_put_format(string, " %zu tables\n", n); + if (verbosity < 1) { + return; + } + + for (;;) { + ts = ofpbuf_try_pull(&b, sizeof *ts); + if (!ts) { + return; + } + + ofp_print_one_ofpst_table_reply(string, OFP12_VERSION, ts->name, ts); + } +} + +static void +ofp_print_ofpst_table_reply11(struct ds *string, const struct ofp_header *oh, + int verbosity) { - const struct ofp_table_stats *ts = ofputil_stats_body(oh); - size_t n = ofputil_stats_body_len(oh) / sizeof *ts; + struct ofp11_table_stats *ts; + struct ofpbuf b; + size_t n; + + ofpbuf_use_const(&b, oh, ntohs(oh->length)); + ofpraw_pull_assert(&b); + + n = b.size / sizeof *ts; ds_put_format(string, " %zu tables\n", n); if (verbosity < 1) { return; } - for (; n--; ts++) { - char name[OFP_MAX_TABLE_NAME_LEN + 1]; - ovs_strlcpy(name, ts->name, sizeof name); + for (;;) { + struct ofp12_table_stats ts12; + + ts = ofpbuf_try_pull(&b, sizeof *ts); + if (!ts) { + return; + } - ds_put_format(string, " %d: %-8s: ", ts->table_id, name); - ds_put_format(string, "wild=0x%05"PRIx32", ", ntohl(ts->wildcards)); - ds_put_format(string, "max=%6"PRIu32", ", ntohl(ts->max_entries)); - ds_put_format(string, "active=%"PRIu32"\n", ntohl(ts->active_count)); - ds_put_cstr(string, " "); - ds_put_format(string, "lookup=%"PRIu64", ", - ntohll(get_32aligned_be64(&ts->lookup_count))); - ds_put_format(string, "matched=%"PRIu64"\n", - ntohll(get_32aligned_be64(&ts->matched_count))); + ts12.table_id = ts->table_id; + ts12.wildcards = htonll(ntohl(ts->wildcards)); + ts12.max_entries = ts->max_entries; + ts12.active_count = ts->active_count; + ts12.lookup_count = ts->lookup_count; + ts12.matched_count = ts->matched_count; + ts12.match = htonll(ntohl(ts->match)); + ts12.instructions = ts->instructions; + ts12.config = ts->config; + ts12.write_actions = ts->write_actions; + ts12.apply_actions = ts->apply_actions; + ofp_print_one_ofpst_table_reply(string, OFP11_VERSION, ts->name, &ts12); } } +static void +ofp_print_ofpst_table_reply10(struct ds *string, const struct ofp_header *oh, + int verbosity) +{ + struct ofp10_table_stats *ts; + struct ofpbuf b; + size_t n; + + ofpbuf_use_const(&b, oh, ntohs(oh->length)); + ofpraw_pull_assert(&b); + + n = b.size / sizeof *ts; + ds_put_format(string, " %zu tables\n", n); + if (verbosity < 1) { + return; + } + + for (;;) { + struct ofp12_table_stats ts12; + + ts = ofpbuf_try_pull(&b, sizeof *ts); + if (!ts) { + return; + } + + ts12.table_id = ts->table_id; + ts12.wildcards = htonll(ntohl(ts->wildcards)); + ts12.max_entries = ts->max_entries; + ts12.active_count = ts->active_count; + ts12.lookup_count = get_32aligned_be64(&ts->lookup_count); + ts12.matched_count = get_32aligned_be64(&ts->matched_count); + ofp_print_one_ofpst_table_reply(string, OFP10_VERSION, ts->name, &ts12); + } +} + +static void +ofp_print_ofpst_table_reply(struct ds *string, const struct ofp_header *oh, + int verbosity) +{ + switch ((enum ofp_version)oh->version) { + case OFP12_VERSION: + ofp_print_ofpst_table_reply12(string, oh, verbosity); + break; + + case OFP11_VERSION: + ofp_print_ofpst_table_reply11(string, oh, verbosity); + break; + + case OFP10_VERSION: + ofp_print_ofpst_table_reply10(string, oh, verbosity); + break; + + default: + NOT_REACHED(); + } +} + static void ofp_print_queue_name(struct ds *string, uint32_t queue_id) { @@ -1151,37 +1344,57 @@ ofp_print_queue_name(struct ds *string, uint32_t queue_id) } static void -ofp_print_ofpst_queue_request(struct ds *string, - const struct ofp_queue_stats_request *qsr) +ofp_print_ofpst_queue_request(struct ds *string, const struct ofp_header *oh) { + struct ofputil_queue_stats_request oqsr; + enum ofperr error; + + error = ofputil_decode_queue_stats_request(oh, &oqsr); + if (error) { + ds_put_format(string, "***decode error: %s***\n", ofperr_get_name(error)); + return; + } + ds_put_cstr(string, "port="); - ofputil_format_port(ntohs(qsr->port_no), string); + ofputil_format_port(oqsr.port_no, string); ds_put_cstr(string, " queue="); - ofp_print_queue_name(string, ntohl(qsr->queue_id)); + ofp_print_queue_name(string, oqsr.queue_id); } static void ofp_print_ofpst_queue_reply(struct ds *string, const struct ofp_header *oh, int verbosity) { - const struct ofp_queue_stats *qs = ofputil_stats_body(oh); - size_t n = ofputil_stats_body_len(oh) / sizeof *qs; - ds_put_format(string, " %zu queues\n", n); + struct ofpbuf b; + + ds_put_format(string, " %zu queues\n", ofputil_count_queue_stats(oh)); if (verbosity < 1) { return; } - for (; n--; qs++) { + ofpbuf_use_const(&b, oh, ntohs(oh->length)); + for (;;) { + struct ofputil_queue_stats qs; + int retval; + + retval = ofputil_decode_queue_stats(&qs, &b); + if (retval) { + if (retval != EOF) { + ds_put_cstr(string, " ***parse error***"); + } + return; + } + ds_put_cstr(string, " port "); - ofputil_format_port(ntohs(qs->port_no), string); + ofputil_format_port(qs.port_no, string); ds_put_cstr(string, " queue "); - ofp_print_queue_name(string, ntohl(qs->queue_id)); + ofp_print_queue_name(string, qs.queue_id); ds_put_cstr(string, ": "); - print_port_stat(string, "bytes=", &qs->tx_bytes, 1); - print_port_stat(string, "pkts=", &qs->tx_packets, 1); - print_port_stat(string, "errors=", &qs->tx_errors, 0); + print_port_stat(string, "bytes=", qs.stats.tx_bytes, 1); + print_port_stat(string, "pkts=", qs.stats.tx_packets, 1); + print_port_stat(string, "errors=", qs.stats.tx_errors, 0); } } @@ -1192,7 +1405,7 @@ ofp_print_ofpst_port_desc_reply(struct ds *string, struct ofpbuf b; ofpbuf_use_const(&b, oh, ntohs(oh->length)); - ofpbuf_pull(&b, sizeof(struct ofp_stats_msg)); + ofpraw_pull_assert(&b); ds_put_char(string, '\n'); ofp_print_phy_ports(string, oh->version, &b); } @@ -1200,22 +1413,19 @@ ofp_print_ofpst_port_desc_reply(struct ds *string, static void ofp_print_stats_request(struct ds *string, const struct ofp_header *oh) { - const struct ofp_stats_msg *srq = (const struct ofp_stats_msg *) oh; + uint16_t flags = ofpmp_flags(oh); - if (srq->flags) { - ds_put_format(string, " ***unknown flags 0x%04"PRIx16"***", - ntohs(srq->flags)); + if (flags) { + ds_put_format(string, " ***unknown flags 0x%04"PRIx16"***", flags); } } static void ofp_print_stats_reply(struct ds *string, const struct ofp_header *oh) { - const struct ofp_stats_msg *srp = (const struct ofp_stats_msg *) oh; - - if (srp->flags) { - uint16_t flags = ntohs(srp->flags); + uint16_t flags = ofpmp_flags(oh); + if (flags) { ds_put_cstr(string, " flags="); if (flags & OFPSF_REPLY_MORE) { ds_put_cstr(string, "[more]"); @@ -1426,7 +1636,7 @@ ofp_print_nxst_flow_monitor_request(struct ds *string, } ds_put_char(string, ' '); - cls_rule_format(&request.match, string); + match_format(&request.match, string, OFP_DEFAULT_PRIORITY); ds_chomp(string, ' '); } } @@ -1443,7 +1653,7 @@ ofp_print_nxst_flow_monitor_reply(struct ds *string, ofpbuf_use_stub(&ofpacts, ofpacts_stub, sizeof ofpacts_stub); for (;;) { struct ofputil_flow_update update; - struct cls_rule match; + struct match match; int retval; update.match = &match; @@ -1488,7 +1698,7 @@ ofp_print_nxst_flow_monitor_reply(struct ds *string, ds_put_format(string, " cookie=%#"PRIx64, ntohll(update.cookie)); ds_put_char(string, ' '); - cls_rule_format(update.match, string); + match_format(update.match, string, OFP_DEFAULT_PRIORITY); if (update.ofpacts_len) { if (string->string[string->length - 1] != ' ') { @@ -1520,195 +1730,178 @@ ofp_print_version(const struct ofp_header *oh, } static void -ofp_to_string__(const struct ofp_header *oh, - const struct ofputil_msg_type *type, struct ds *string, - int verbosity) +ofp_header_to_string__(const struct ofp_header *oh, enum ofpraw raw, + struct ds *string) { - enum ofputil_msg_code code; - const void *msg = oh; - - ds_put_cstr(string, ofputil_msg_type_name(type)); + ds_put_cstr(string, ofpraw_get_name(raw)); ofp_print_version(oh, string); - code = ofputil_msg_type_code(type); - switch (code) { - case OFPUTIL_MSG_INVALID: - break; +} - case OFPUTIL_OFPT_HELLO: - ds_put_char(string, '\n'); - ds_put_hex_dump(string, oh + 1, ntohs(oh->length) - sizeof *oh, - 0, true); - break; +static void +ofp_to_string__(const struct ofp_header *oh, enum ofpraw raw, + struct ds *string, int verbosity) +{ + const void *msg = oh; - case OFPUTIL_OFPT_ERROR: - ofp_print_error_msg(string, msg); + ofp_header_to_string__(oh, raw, string); + switch (ofptype_from_ofpraw(raw)) { + case OFPTYPE_HELLO: + ofp_print_hello(string, oh); break; - case OFPUTIL_OFPT_ECHO_REQUEST: - case OFPUTIL_OFPT_ECHO_REPLY: - ofp_print_echo(string, oh, verbosity); + case OFPTYPE_ERROR: + ofp_print_error_msg(string, oh); break; - case OFPUTIL_OFPT_FEATURES_REQUEST: + case OFPTYPE_ECHO_REQUEST: + case OFPTYPE_ECHO_REPLY: + ofp_print_echo(string, oh, verbosity); break; - case OFPUTIL_OFPT_FEATURES_REPLY: - ofp_print_switch_features(string, msg); + case OFPTYPE_FEATURES_REQUEST: break; - case OFPUTIL_OFPT_GET_CONFIG_REQUEST: + case OFPTYPE_FEATURES_REPLY: + ofp_print_switch_features(string, oh); break; - case OFPUTIL_OFPT_GET_CONFIG_REPLY: - case OFPUTIL_OFPT_SET_CONFIG: - ofp_print_switch_config(string, msg); + case OFPTYPE_GET_CONFIG_REQUEST: break; - case OFPUTIL_OFPT_PACKET_IN: - case OFPUTIL_NXT_PACKET_IN: - ofp_print_packet_in(string, msg, verbosity); + case OFPTYPE_GET_CONFIG_REPLY: + case OFPTYPE_SET_CONFIG: + ofp_print_switch_config(string, ofpmsg_body(oh)); break; - case OFPUTIL_OFPT_FLOW_REMOVED: - case OFPUTIL_NXT_FLOW_REMOVED: - ofp_print_flow_removed(string, msg); + case OFPTYPE_PACKET_IN: + ofp_print_packet_in(string, oh, verbosity); break; - case OFPUTIL_OFPT_PORT_STATUS: - ofp_print_port_status(string, msg); + case OFPTYPE_FLOW_REMOVED: + ofp_print_flow_removed(string, oh); break; - case OFPUTIL_OFPT_PACKET_OUT: - ofp_print_packet_out(string, msg, verbosity); + case OFPTYPE_PORT_STATUS: + ofp_print_port_status(string, oh); break; - case OFPUTIL_OFPT_FLOW_MOD: - case OFPUTIL_NXT_FLOW_MOD: - ofp_print_flow_mod(string, msg, code, verbosity); + case OFPTYPE_PACKET_OUT: + ofp_print_packet_out(string, oh, verbosity); break; - case OFPUTIL_OFPT_PORT_MOD: - ofp_print_port_mod(string, msg); + case OFPTYPE_FLOW_MOD: + ofp_print_flow_mod(string, oh, verbosity); break; - case OFPUTIL_OFPT_BARRIER_REQUEST: - case OFPUTIL_OFPT_BARRIER_REPLY: + case OFPTYPE_PORT_MOD: + ofp_print_port_mod(string, oh); break; - case OFPUTIL_OFPT_QUEUE_GET_CONFIG_REQUEST: - case OFPUTIL_OFPT_QUEUE_GET_CONFIG_REPLY: - /* XXX */ + case OFPTYPE_BARRIER_REQUEST: + case OFPTYPE_BARRIER_REPLY: break; - case OFPUTIL_OFPST_DESC_REQUEST: - case OFPUTIL_OFPST_PORT_DESC_REQUEST: + case OFPTYPE_DESC_STATS_REQUEST: + case OFPTYPE_PORT_DESC_STATS_REQUEST: ofp_print_stats_request(string, oh); break; - case OFPUTIL_OFPST_FLOW_REQUEST: - case OFPUTIL_NXST_FLOW_REQUEST: - case OFPUTIL_OFPST_AGGREGATE_REQUEST: - case OFPUTIL_NXST_AGGREGATE_REQUEST: + case OFPTYPE_FLOW_STATS_REQUEST: + case OFPTYPE_AGGREGATE_STATS_REQUEST: ofp_print_stats_request(string, oh); - ofp_print_flow_stats_request(string, msg); + ofp_print_flow_stats_request(string, oh); break; - case OFPUTIL_OFPST_TABLE_REQUEST: + case OFPTYPE_TABLE_STATS_REQUEST: ofp_print_stats_request(string, oh); break; - case OFPUTIL_OFPST_PORT_REQUEST: + case OFPTYPE_PORT_STATS_REQUEST: ofp_print_stats_request(string, oh); - ofp_print_ofpst_port_request(string, msg); + ofp_print_ofpst_port_request(string, oh); break; - case OFPUTIL_OFPST_QUEUE_REQUEST: + case OFPTYPE_QUEUE_STATS_REQUEST: ofp_print_stats_request(string, oh); - ofp_print_ofpst_queue_request(string, msg); + ofp_print_ofpst_queue_request(string, oh); break; - case OFPUTIL_OFPST_DESC_REPLY: + case OFPTYPE_DESC_STATS_REPLY: ofp_print_stats_reply(string, oh); - ofp_print_ofpst_desc_reply(string, msg); + ofp_print_ofpst_desc_reply(string, oh); break; - case OFPUTIL_OFPST_FLOW_REPLY: - case OFPUTIL_NXST_FLOW_REPLY: + case OFPTYPE_FLOW_STATS_REPLY: ofp_print_stats_reply(string, oh); ofp_print_flow_stats_reply(string, oh); break; - case OFPUTIL_OFPST_QUEUE_REPLY: + case OFPTYPE_QUEUE_STATS_REPLY: ofp_print_stats_reply(string, oh); ofp_print_ofpst_queue_reply(string, oh, verbosity); break; - case OFPUTIL_OFPST_PORT_REPLY: + case OFPTYPE_PORT_STATS_REPLY: ofp_print_stats_reply(string, oh); ofp_print_ofpst_port_reply(string, oh, verbosity); break; - case OFPUTIL_OFPST_TABLE_REPLY: + case OFPTYPE_TABLE_STATS_REPLY: ofp_print_stats_reply(string, oh); ofp_print_ofpst_table_reply(string, oh, verbosity); break; - case OFPUTIL_OFPST_AGGREGATE_REPLY: + case OFPTYPE_AGGREGATE_STATS_REPLY: ofp_print_stats_reply(string, oh); - ofp_print_ofpst_aggregate_reply(string, msg); + ofp_print_aggregate_stats_reply(string, oh); break; - case OFPUTIL_OFPST_PORT_DESC_REPLY: + case OFPTYPE_PORT_DESC_STATS_REPLY: ofp_print_stats_reply(string, oh); ofp_print_ofpst_port_desc_reply(string, oh); break; - case OFPUTIL_NXT_ROLE_REQUEST: - case OFPUTIL_NXT_ROLE_REPLY: - ofp_print_nxt_role_message(string, msg); + case OFPTYPE_ROLE_REQUEST: + case OFPTYPE_ROLE_REPLY: + ofp_print_nxt_role_message(string, ofpmsg_body(oh)); break; - case OFPUTIL_NXT_FLOW_MOD_TABLE_ID: - ofp_print_nxt_flow_mod_table_id(string, msg); + case OFPTYPE_FLOW_MOD_TABLE_ID: + ofp_print_nxt_flow_mod_table_id(string, ofpmsg_body(oh)); break; - case OFPUTIL_NXT_SET_FLOW_FORMAT: - ofp_print_nxt_set_flow_format(string, msg); + case OFPTYPE_SET_FLOW_FORMAT: + ofp_print_nxt_set_flow_format(string, ofpmsg_body(oh)); break; - case OFPUTIL_NXT_SET_PACKET_IN_FORMAT: - ofp_print_nxt_set_packet_in_format(string, msg); + case OFPTYPE_SET_PACKET_IN_FORMAT: + ofp_print_nxt_set_packet_in_format(string, ofpmsg_body(oh)); break; - case OFPUTIL_NXT_FLOW_AGE: + case OFPTYPE_FLOW_AGE: break; - case OFPUTIL_NXT_SET_CONTROLLER_ID: - ofp_print_nxt_set_controller_id(string, msg); + case OFPTYPE_SET_CONTROLLER_ID: + ofp_print_nxt_set_controller_id(string, ofpmsg_body(oh)); break; - case OFPUTIL_NXT_SET_ASYNC_CONFIG: - ofp_print_nxt_set_async_config(string, msg); - break; - - case OFPUTIL_NXST_AGGREGATE_REPLY: - ofp_print_stats_reply(string, oh); - ofp_print_nxst_aggregate_reply(string, msg); + case OFPTYPE_SET_ASYNC_CONFIG: + ofp_print_nxt_set_async_config(string, ofpmsg_body(oh)); break; - case OFPUTIL_NXT_FLOW_MONITOR_CANCEL: + case OFPTYPE_FLOW_MONITOR_CANCEL: ofp_print_nxt_flow_monitor_cancel(string, msg); break; - case OFPUTIL_NXT_FLOW_MONITOR_PAUSED: - case OFPUTIL_NXT_FLOW_MONITOR_RESUMED: + case OFPTYPE_FLOW_MONITOR_PAUSED: + case OFPTYPE_FLOW_MONITOR_RESUMED: break; - case OFPUTIL_NXST_FLOW_MONITOR_REQUEST: + case OFPTYPE_FLOW_MONITOR_STATS_REQUEST: ofp_print_nxst_flow_monitor_request(string, msg); break; - case OFPUTIL_NXST_FLOW_MONITOR_REPLY: + case OFPTYPE_FLOW_MONITOR_STATS_REPLY: ofp_print_nxst_flow_monitor_reply(string, msg); break; } @@ -1730,6 +1923,15 @@ ofp_to_string(const void *oh_, size_t len, int verbosity) ds_put_format(&string, "OpenFlow packet too short (only %zu bytes):\n", len); } else if (ntohs(oh->length) > len) { + enum ofperr error; + enum ofpraw raw; + + error = ofpraw_decode_partial(&raw, oh, len); + if (!error) { + ofp_header_to_string__(oh, raw, &string); + ds_put_char(&string, '\n'); + } + ds_put_format(&string, "(***truncated to %zu bytes from %"PRIu16"***)\n", len, ntohs(oh->length)); @@ -1738,12 +1940,12 @@ ofp_to_string(const void *oh_, size_t len, int verbosity) "(***only uses %"PRIu16" bytes out of %zu***)\n", ntohs(oh->length), len); } else { - const struct ofputil_msg_type *type; enum ofperr error; + enum ofpraw raw; - error = ofputil_decode_msg_type(oh, &type); + error = ofpraw_decode(&raw, oh); if (!error) { - ofp_to_string__(oh, type, &string, verbosity); + ofp_to_string__(oh, raw, &string, verbosity); if (verbosity >= 5) { if (ds_last(&string) != '\n') { ds_put_char(&string, '\n');