X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofp-print.c;h=cbac1e44ac8e67b80941db2e2f00e9bd9805dd61;hb=007948177581f3b3dad188221593d0e4bdca6ba0;hp=63edb79c41c520de5618ef2dbfb9fdf9717ef44c;hpb=49ad0403a79ed166fad156dd649f8f9d63fc9dc3;p=sliver-openvswitch.git diff --git a/lib/ofp-print.c b/lib/ofp-print.c index 63edb79c4..cbac1e44a 100644 --- a/lib/ofp-print.c +++ b/lib/ofp-print.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,6 +30,7 @@ #include "compiler.h" #include "dynamic-string.h" #include "flow.h" +#include "multipath.h" #include "nx-match.h" #include "ofp-util.h" #include "ofpbuf.h" @@ -38,6 +39,7 @@ #include "packets.h" #include "pcap.h" #include "type-props.h" +#include "unaligned.h" #include "util.h" static void ofp_print_port_name(struct ds *string, uint16_t port); @@ -80,7 +82,7 @@ ofp_packet_to_string(const void *data, size_t len, size_t total_len OVS_UNUSED) } rewind(pcap); - snprintf(command, sizeof command, "/usr/sbin/tcpdump -e -n -r /dev/fd/%d 2>/dev/null", + snprintf(command, sizeof command, "/usr/sbin/tcpdump -t -e -n -r /dev/fd/%d 2>/dev/null", fileno(pcap)); tcpdump = popen(command, "r"); fclose(pcap); @@ -216,6 +218,8 @@ nx_action_len(enum nx_action_subtype subtype) case NXAST_REG_LOAD: return sizeof(struct nx_action_reg_load); case NXAST_NOTE: return -1; case NXAST_SET_TUNNEL64: return sizeof(struct nx_action_set_tunnel64); + case NXAST_MULTIPATH: return sizeof(struct nx_action_multipath); + case NXAST_AUTOPATH: return sizeof (struct nx_action_autopath); default: return -1; } } @@ -223,7 +227,7 @@ nx_action_len(enum nx_action_subtype subtype) static void ofp_print_nx_action(struct ds *string, const struct nx_action_header *nah) { - uint16_t subtype = ntohs(nah->subtype); + int subtype = ntohs(nah->subtype); int required_len = nx_action_len(subtype); int len = ntohs(nah->len); @@ -240,6 +244,8 @@ ofp_print_nx_action(struct ds *string, const struct nx_action_header *nah) const struct nx_action_resubmit *nar; const struct nx_action_reg_move *move; const struct nx_action_reg_load *load; + const struct nx_action_multipath *nam; + const struct nx_action_autopath *naa; switch ((enum nx_action_subtype) subtype) { case NXAST_RESUBMIT: @@ -281,18 +287,32 @@ ofp_print_nx_action(struct ds *string, const struct nx_action_header *nah) return; case NXAST_SET_TUNNEL64: - nast64 = (struct nx_action_set_tunnel64 *) nah; + nast64 = (const struct nx_action_set_tunnel64 *) nah; ds_put_format(string, "set_tunnel64:%#"PRIx64, ntohll(nast64->tun_id)); return; + case NXAST_MULTIPATH: + nam = (const struct nx_action_multipath *) nah; + multipath_format(nam, string); + return; + + case NXAST_AUTOPATH: + naa = (const struct nx_action_autopath *)nah; + ds_put_format(string, "autopath(%u,", ntohl(naa->id)); + nxm_format_field_bits(string, ntohl(naa->dst), + nxm_decode_ofs(naa->ofs_nbits), + nxm_decode_n_bits(naa->ofs_nbits)); + ds_put_char(string, ')'); + return; + case NXAST_SNAT__OBSOLETE: default: break; } } - ds_put_format(string, "***unknown Nicira action:%"PRIu16"***", subtype); + ds_put_format(string, "***unknown Nicira action:%d***", subtype); } static int @@ -594,7 +614,7 @@ ofp_print_phy_port(struct ds *string, const struct ofp_phy_port *port) memcpy(name, port->name, sizeof name); for (j = 0; j < sizeof name - 1; j++) { - if (!isprint(name[j])) { + if (!isprint((unsigned char) name[j])) { break; } } @@ -655,6 +675,22 @@ ofp_print_switch_config(struct ds *string, const struct ofp_switch_config *osc) uint16_t flags; flags = ntohs(osc->flags); + + ds_put_cstr(string, " frags="); + switch (flags & OFPC_FRAG_MASK) { + case OFPC_FRAG_NORMAL: + ds_put_cstr(string, "normal"); + flags &= ~OFPC_FRAG_MASK; + break; + case OFPC_FRAG_DROP: + ds_put_cstr(string, "drop"); + flags &= ~OFPC_FRAG_MASK; + break; + case OFPC_FRAG_REASM: + ds_put_cstr(string, "reassemble"); + flags &= ~OFPC_FRAG_MASK; + break; + } if (flags) { ds_put_format(string, " ***unknown flags 0x%04"PRIx16"***", flags); } @@ -686,7 +722,7 @@ static void print_wild(struct ds *string, const char *leader, int is_wild, } static void -print_ip_netmask(struct ds *string, const char *leader, uint32_t ip, +print_ip_netmask(struct ds *string, const char *leader, ovs_be32 ip, uint32_t wild_bits, int verbosity) { if (wild_bits >= 32 && verbosity < 2) { @@ -725,11 +761,11 @@ ofp_match_to_string(const struct ofp_match *om, int verbosity) if (om->dl_type == htons(ETH_TYPE_IP)) { if (!(w & OFPFW_NW_PROTO)) { skip_proto = true; - if (om->nw_proto == IP_TYPE_ICMP) { + if (om->nw_proto == IPPROTO_ICMP) { ds_put_cstr(&f, "icmp,"); - } else if (om->nw_proto == IP_TYPE_TCP) { + } else if (om->nw_proto == IPPROTO_TCP) { ds_put_cstr(&f, "tcp,"); - } else if (om->nw_proto == IP_TYPE_UDP) { + } else if (om->nw_proto == IPPROTO_UDP) { ds_put_cstr(&f, "udp,"); } else { ds_put_cstr(&f, "ip,"); @@ -744,9 +780,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, @@ -776,7 +809,7 @@ ofp_match_to_string(const struct ofp_match *om, int verbosity) } print_wild(&f, "nw_tos=", w & OFPFW_NW_TOS, verbosity, "%u", om->nw_tos); - if (om->nw_proto == IP_TYPE_ICMP) { + if (om->nw_proto == IPPROTO_ICMP) { print_wild(&f, "icmp_type=", w & OFPFW_ICMP_TYPE, verbosity, "%d", ntohs(om->icmp_type)); print_wild(&f, "icmp_code=", w & OFPFW_ICMP_CODE, verbosity, @@ -801,7 +834,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); + error = ofputil_decode_flow_mod(&fm, oh, true); if (error) { ofp_print_error(s, error); return; @@ -827,6 +860,9 @@ ofp_print_flow_mod(struct ds *s, const struct ofp_header *oh, default: 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_char(s, ' '); if (verbosity >= 3 && code == OFPUTIL_OFPT_FLOW_MOD) { @@ -898,12 +934,13 @@ 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; } + ds_put_char(string, ' '); cls_rule_format(&fr.rule, string); ds_put_cstr(string, " reason="); @@ -945,158 +982,52 @@ ofp_print_port_mod(struct ds *string, const struct ofp_port_mod *opm) } } -struct error_type { - int type; - int code; - const char *name; -}; - -static const struct error_type error_types[] = { -#define ERROR_TYPE(TYPE) {TYPE, -1, #TYPE} -#define ERROR_CODE(TYPE, CODE) {TYPE, CODE, #CODE} - ERROR_TYPE(OFPET_HELLO_FAILED), - ERROR_CODE(OFPET_HELLO_FAILED, OFPHFC_INCOMPATIBLE), - ERROR_CODE(OFPET_HELLO_FAILED, OFPHFC_EPERM), - - ERROR_TYPE(OFPET_BAD_REQUEST), - ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_BAD_VERSION), - ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_BAD_TYPE), - ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_BAD_STAT), - ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_BAD_VENDOR), - ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_BAD_SUBTYPE), - ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_EPERM), - ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_BAD_LEN), - ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_BUFFER_EMPTY), - ERROR_CODE(OFPET_BAD_REQUEST, OFPBRC_BUFFER_UNKNOWN), - /* Nicira error extensions. */ - ERROR_CODE(OFPET_BAD_REQUEST, NXBRC_NXM_INVALID), - ERROR_CODE(OFPET_BAD_REQUEST, NXBRC_NXM_BAD_TYPE), - ERROR_CODE(OFPET_BAD_REQUEST, NXBRC_NXM_BAD_VALUE), - ERROR_CODE(OFPET_BAD_REQUEST, NXBRC_NXM_BAD_MASK), - ERROR_CODE(OFPET_BAD_REQUEST, NXBRC_NXM_BAD_PREREQ), - ERROR_CODE(OFPET_BAD_REQUEST, NXBRC_NXM_DUP_TYPE), - - ERROR_TYPE(OFPET_BAD_ACTION), - ERROR_CODE(OFPET_BAD_ACTION, OFPBAC_BAD_TYPE), - ERROR_CODE(OFPET_BAD_ACTION, OFPBAC_BAD_LEN), - ERROR_CODE(OFPET_BAD_ACTION, OFPBAC_BAD_VENDOR), - ERROR_CODE(OFPET_BAD_ACTION, OFPBAC_BAD_VENDOR_TYPE), - ERROR_CODE(OFPET_BAD_ACTION, OFPBAC_BAD_OUT_PORT), - ERROR_CODE(OFPET_BAD_ACTION, OFPBAC_BAD_ARGUMENT), - ERROR_CODE(OFPET_BAD_ACTION, OFPBAC_EPERM), - ERROR_CODE(OFPET_BAD_ACTION, OFPBAC_TOO_MANY), - - ERROR_TYPE(OFPET_FLOW_MOD_FAILED), - ERROR_CODE(OFPET_FLOW_MOD_FAILED, OFPFMFC_ALL_TABLES_FULL), - ERROR_CODE(OFPET_FLOW_MOD_FAILED, OFPFMFC_OVERLAP), - ERROR_CODE(OFPET_FLOW_MOD_FAILED, OFPFMFC_EPERM), - ERROR_CODE(OFPET_FLOW_MOD_FAILED, OFPFMFC_BAD_EMERG_TIMEOUT), - ERROR_CODE(OFPET_FLOW_MOD_FAILED, OFPFMFC_BAD_COMMAND), - /* Nicira error extenstions. */ - ERROR_CODE(OFPET_FLOW_MOD_FAILED, NXFMFC_HARDWARE), - ERROR_CODE(OFPET_FLOW_MOD_FAILED, NXFMFC_BAD_TABLE_ID), - - ERROR_TYPE(OFPET_PORT_MOD_FAILED), - ERROR_CODE(OFPET_PORT_MOD_FAILED, OFPPMFC_BAD_PORT), - ERROR_CODE(OFPET_PORT_MOD_FAILED, OFPPMFC_BAD_HW_ADDR) -}; -#define N_ERROR_TYPES ARRAY_SIZE(error_types) - -static const char * -lookup_error_type(int type) -{ - const struct error_type *t; - - for (t = error_types; t < &error_types[N_ERROR_TYPES]; t++) { - if (t->type == type && t->code == -1) { - return t->name; - } - } - return "?"; -} - -static const char * -lookup_error_code(int type, int code) -{ - const struct error_type *t; - - for (t = error_types; t < &error_types[N_ERROR_TYPES]; t++) { - if (t->type == type && t->code == code) { - return t->name; - } - } - return "?"; -} - static void ofp_print_error(struct ds *string, int error) { - int type = get_ofp_err_type(error); - int code = get_ofp_err_code(error); if (string->length) { ds_put_char(string, ' '); } - ds_put_format(string, " ***decode error type:%d(%s) code:%d(%s)***\n", - type, lookup_error_type(type), - code, lookup_error_code(type, code)); -} - -static void -ofp_print_nx_error_msg(struct ds *string, const struct ofp_error_msg *oem) -{ - size_t len = ntohs(oem->header.length); - const struct nx_vendor_error *nve = (struct nx_vendor_error *)oem->data; - int vendor = ntohl(nve->vendor); - int type = ntohs(nve->type); - int code = ntohs(nve->code); - - ds_put_format(string, " vendor:%x type:%d(%s) code:%d(%s) payload:\n", - vendor, - type, lookup_error_type(type), - code, lookup_error_code(type, code)); - - ds_put_hex_dump(string, nve + 1, len - sizeof *oem - sizeof *nve, - 0, true); + ds_put_cstr(string, "***decode error: "); + ofputil_format_error(string, error); + ds_put_cstr(string, "***\n"); } static void ofp_print_error_msg(struct ds *string, const struct ofp_error_msg *oem) { size_t len = ntohs(oem->header.length); - int type = ntohs(oem->type); - int code = ntohs(oem->code); + size_t payload_ofs, payload_len; + const void *payload; + int error; char *s; - - if (type == NXET_VENDOR && code == NXVC_VENDOR_ERROR) { - if (len < sizeof *oem + sizeof(struct nx_vendor_error)) { - ds_put_format(string, - "(***truncated extended error message is %zu bytes " - "when it should be at least %zu***)\n", - len, sizeof(struct nx_vendor_error)); - return; - } - - return ofp_print_nx_error_msg(string, oem); + error = ofputil_decode_error_msg(&oem->header, &payload_ofs); + if (!is_ofp_error(error)) { + ofp_print_error(string, error); + ds_put_hex_dump(string, oem->data, len - sizeof *oem, 0, true); + return; } - ds_put_format(string, " type:%d(%s) code:%d(%s) payload:\n", - type, lookup_error_type(type), - code, lookup_error_code(type, code)); + ds_put_char(string, ' '); + ofputil_format_error(string, error); + ds_put_char(string, '\n'); - switch (type) { + payload = (const uint8_t *) oem + payload_ofs; + payload_len = len - payload_ofs; + switch (get_ofp_err_type(error)) { case OFPET_HELLO_FAILED: - ds_put_printable(string, (char *) oem->data, len - sizeof *oem); + ds_put_printable(string, payload, payload_len); break; case OFPET_BAD_REQUEST: - s = ofp_to_string(oem->data, len - sizeof *oem, 1); + s = ofp_to_string(payload, payload_len, 1); ds_put_cstr(string, s); free(s); break; default: - ds_put_hex_dump(string, oem->data, len - sizeof *oem, 0, true); + ds_put_hex_dump(string, payload, payload_len, 0, true); break; } } @@ -1120,6 +1051,7 @@ ofp_print_ofpst_desc_reply(struct ds *string, const struct ofp_header *oh) { 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); ds_put_format(string, "Hardware: %.*s\n", @@ -1138,7 +1070,7 @@ ofp_print_flow_stats_request(struct ds *string, const struct ofp_header *oh) struct flow_stats_request fsr; int error; - error = ofputil_decode_flow_stats_request(&fsr, oh, NXFF_OPENFLOW10); + error = ofputil_decode_flow_stats_request(&fsr, oh); if (error) { ofp_print_error(string, error); return; @@ -1153,149 +1085,52 @@ ofp_print_flow_stats_request(struct ds *string, const struct ofp_header *oh) ofp_print_port_name(string, fsr.out_port); } + /* 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); } static void -ofp_print_ofpst_flow_reply(struct ds *string, const struct ofp_header *oh, - int verbosity) +ofp_print_flow_stats_reply(struct ds *string, const struct ofp_header *oh) { - size_t len = ofputil_stats_body_len(oh); - const char *body = ofputil_stats_body(oh); - const char *pos = body; - for (;;) { - const struct ofp_flow_stats *fs; - ptrdiff_t bytes_left = body + len - pos; - size_t length; + struct ofpbuf b; - ds_put_char(string, '\n'); + ofpbuf_use_const(&b, oh, ntohs(oh->length)); + for (;;) { + struct ofputil_flow_stats fs; + int retval; - if (bytes_left < sizeof *fs) { - if (bytes_left != 0) { - ds_put_format(string, " ***%td leftover bytes at end***", - bytes_left); + retval = ofputil_decode_flow_stats_reply(&fs, &b); + if (retval) { + if (retval != EOF) { + ds_put_cstr(string, " ***parse error***"); } break; } - fs = (const void *) pos; - length = ntohs(fs->length); - if (length < sizeof *fs) { - ds_put_format(string, " ***length=%zu shorter than minimum %zu***", - length, sizeof *fs); - break; - } else if (length > bytes_left) { - ds_put_format(string, - " ***length=%zu but only %td bytes left***", - length, bytes_left); - break; - } else if ((length - sizeof *fs) % sizeof fs->actions[0]) { - ds_put_format(string, - " ***length=%zu has %zu bytes leftover in " - "final action***", - length, - (length - sizeof *fs) % sizeof fs->actions[0]); - break; - } - - ds_put_format(string, " cookie=0x%"PRIx64", duration=", - ntohll(fs->cookie)); - ofp_print_duration(string, ntohl(fs->duration_sec), - ntohl(fs->duration_nsec)); - ds_put_format(string, ", table_id=%"PRIu8", ", fs->table_id); - ds_put_format(string, "priority=%"PRIu16", ", ntohs(fs->priority)); - ds_put_format(string, "n_packets=%"PRIu64", ", - ntohll(fs->packet_count)); - ds_put_format(string, "n_bytes=%"PRIu64", ", ntohll(fs->byte_count)); - if (fs->idle_timeout != htons(OFP_FLOW_PERMANENT)) { - ds_put_format(string, "idle_timeout=%"PRIu16",", - ntohs(fs->idle_timeout)); - } - if (fs->hard_timeout != htons(OFP_FLOW_PERMANENT)) { - ds_put_format(string, "hard_timeout=%"PRIu16",", - ntohs(fs->hard_timeout)); - } - ofp_print_match(string, &fs->match, verbosity); - ds_put_char(string, ' '); - ofp_print_actions(string, fs->actions, length - sizeof *fs); - - pos += length; - } -} - -static void -ofp_print_nxst_flow_reply(struct ds *string, const struct ofp_header *oh) -{ - struct ofpbuf b; - - ofpbuf_use_const(&b, ofputil_nxstats_body(oh), - ofputil_nxstats_body_len(oh)); - while (b.size > 0) { - const struct nx_flow_stats *fs; - union ofp_action *actions; - struct cls_rule rule; - size_t actions_len, n_actions; - size_t length; - int match_len; - int error; - ds_put_char(string, '\n'); - fs = ofpbuf_try_pull(&b, sizeof *fs); - if (!fs) { - ds_put_format(string, " ***%td leftover bytes at end***", b.size); - break; - } - - length = ntohs(fs->length); - if (length < sizeof *fs) { - ds_put_format(string, " ***nx_flow_stats claims length %zu***", - length); - break; - } - - match_len = ntohs(fs->match_len); - if (match_len > length - sizeof *fs) { - ds_put_format(string, " ***length=%zu match_len=%d***", - length, match_len); - break; - } - ds_put_format(string, " cookie=0x%"PRIx64", duration=", - ntohll(fs->cookie)); - ofp_print_duration(string, ntohl(fs->duration_sec), - ntohl(fs->duration_nsec)); - ds_put_format(string, ", table_id=%"PRIu8", ", fs->table_id); - ds_put_format(string, "n_packets=%"PRIu64", ", - ntohll(fs->packet_count)); - ds_put_format(string, "n_bytes=%"PRIu64", ", ntohll(fs->byte_count)); - if (fs->idle_timeout != htons(OFP_FLOW_PERMANENT)) { - ds_put_format(string, "idle_timeout=%"PRIu16",", - ntohs(fs->idle_timeout)); + 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, "n_packets=%"PRIu64", ", fs.packet_count); + ds_put_format(string, "n_bytes=%"PRIu64", ", fs.byte_count); + if (fs.idle_timeout != OFP_FLOW_PERMANENT) { + ds_put_format(string, "idle_timeout=%"PRIu16",", fs.idle_timeout); } - if (fs->hard_timeout != htons(OFP_FLOW_PERMANENT)) { - ds_put_format(string, "hard_timeout=%"PRIu16",", - ntohs(fs->hard_timeout)); - } - - error = nx_pull_match(&b, match_len, ntohs(fs->priority), &rule); - if (error) { - ofp_print_error(string, error); - break; - } - - actions_len = length - sizeof *fs - ROUND_UP(match_len, 8); - error = ofputil_pull_actions(&b, actions_len, &actions, &n_actions); - if (error) { - ofp_print_error(string, error); - break; + if (fs.hard_timeout != OFP_FLOW_PERMANENT) { + ds_put_format(string, "hard_timeout=%"PRIu16",", fs.hard_timeout); } - cls_rule_format(&rule, string); + cls_rule_format(&fs.rule, string); ds_put_char(string, ' '); - ofp_print_actions(string, (const struct ofp_action_header *) actions, - n_actions * sizeof *actions); + ofp_print_actions(string, + (const struct ofp_action_header *) fs.actions, + fs.n_actions * sizeof *fs.actions); } } @@ -1303,8 +1138,10 @@ static void ofp_print_ofp_aggregate_stats_reply ( struct ds *string, const struct ofp_aggregate_stats_reply *asr) { - ds_put_format(string, " packet_count=%"PRIu64, ntohll(asr->packet_count)); - ds_put_format(string, " byte_count=%"PRIu64, ntohll(asr->byte_count)); + 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)); } @@ -1322,10 +1159,12 @@ ofp_print_nxst_aggregate_reply(struct ds *string, } static void print_port_stat(struct ds *string, const char *leader, - uint64_t stat, int more) + const ovs_32aligned_be64 *statp, int more) { + uint64_t stat = ntohll(get_32aligned_be64(statp)); + ds_put_cstr(string, leader); - if (stat != -1) { + if (stat != UINT64_MAX) { ds_put_format(string, "%"PRIu64, stat); } else { ds_put_char(string, '?'); @@ -1341,7 +1180,7 @@ static void ofp_print_ofpst_port_request(struct ds *string, const struct ofp_header *oh) { const struct ofp_port_stats_request *psr = ofputil_stats_body(oh); - ds_put_format(string, "port_no=%"PRIu16, ntohs(psr->port_no)); + ds_put_format(string, " port_no=%"PRIu16, ntohs(psr->port_no)); } static void @@ -1359,20 +1198,20 @@ ofp_print_ofpst_port_reply(struct ds *string, const struct ofp_header *oh, ds_put_format(string, " port %2"PRIu16": ", ntohs(ps->port_no)); ds_put_cstr(string, "rx "); - print_port_stat(string, "pkts=", ntohll(ps->rx_packets), 1); - print_port_stat(string, "bytes=", ntohll(ps->rx_bytes), 1); - print_port_stat(string, "drop=", ntohll(ps->rx_dropped), 1); - print_port_stat(string, "errs=", ntohll(ps->rx_errors), 1); - print_port_stat(string, "frame=", ntohll(ps->rx_frame_err), 1); - print_port_stat(string, "over=", ntohll(ps->rx_over_err), 1); - print_port_stat(string, "crc=", ntohll(ps->rx_crc_err), 0); + 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); ds_put_cstr(string, " tx "); - print_port_stat(string, "pkts=", ntohll(ps->tx_packets), 1); - print_port_stat(string, "bytes=", ntohll(ps->tx_bytes), 1); - print_port_stat(string, "drop=", ntohll(ps->tx_dropped), 1); - print_port_stat(string, "errs=", ntohll(ps->tx_errors), 1); - print_port_stat(string, "coll=", ntohll(ps->collisions), 0); + 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); } } @@ -1389,8 +1228,7 @@ ofp_print_ofpst_table_reply(struct ds *string, const struct ofp_header *oh, for (; n--; ts++) { char name[OFP_MAX_TABLE_NAME_LEN + 1]; - strncpy(name, ts->name, sizeof name); - name[OFP_MAX_TABLE_NAME_LEN] = '\0'; + ovs_strlcpy(name, ts->name, sizeof name); ds_put_format(string, " %d: %-8s: ", ts->table_id, name); ds_put_format(string, "wild=0x%05"PRIx32", ", ntohl(ts->wildcards)); @@ -1398,9 +1236,9 @@ ofp_print_ofpst_table_reply(struct ds *string, const struct ofp_header *oh, 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)); + ntohll(get_32aligned_be64(&ts->lookup_count))); ds_put_format(string, "matched=%"PRIu64"\n", - ntohll(ts->matched_count)); + ntohll(get_32aligned_be64(&ts->matched_count))); } } @@ -1444,9 +1282,9 @@ ofp_print_ofpst_queue_reply(struct ds *string, const struct ofp_header *oh, ofp_print_queue_name(string, ntohl(qs->queue_id)); ds_put_cstr(string, ": "); - print_port_stat(string, "bytes=", ntohll(qs->tx_bytes), 1); - print_port_stat(string, "pkts=", ntohll(qs->tx_packets), 1); - print_port_stat(string, "errors=", ntohll(qs->tx_errors), 0); + 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); } } @@ -1493,25 +1331,6 @@ ofp_print_echo(struct ds *string, const struct ofp_header *oh, int verbosity) } } -static void -ofp_print_nxt_status_message(struct ds *string, const struct ofp_header *oh) -{ - struct ofpbuf b; - - ofpbuf_use_const(&b, oh, ntohs(oh->length)); - ofpbuf_pull(&b, sizeof *oh); - ds_put_char(string, '"'); - ds_put_printable(string, b.data, b.size); - ds_put_char(string, '"'); -} - -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) @@ -1530,6 +1349,13 @@ ofp_print_nxt_role_message(struct ds *string, } } +static void +ofp_print_nxt_flow_mod_table_id(struct ds *string, + const struct nxt_flow_mod_table_id *nfmti) +{ + ds_put_format(string, " %s", nfmti->set ? "enable" : "disable"); +} + static void ofp_print_nxt_set_flow_format(struct ds *string, const struct nxt_set_flow_format *nsff) @@ -1561,6 +1387,9 @@ ofp_to_string__(const struct ofp_header *oh, 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; case OFPUTIL_OFPT_ERROR: @@ -1653,8 +1482,9 @@ ofp_to_string__(const struct ofp_header *oh, break; case OFPUTIL_OFPST_FLOW_REPLY: + case OFPUTIL_NXST_FLOW_REPLY: ofp_print_stats_reply(string, oh); - ofp_print_ofpst_flow_reply(string, oh, verbosity); + ofp_print_flow_stats_reply(string, oh); break; case OFPUTIL_OFPST_QUEUE_REPLY: @@ -1677,20 +1507,15 @@ ofp_to_string__(const struct ofp_header *oh, ofp_print_ofpst_aggregate_reply(string, oh); break; - case OFPUTIL_NXT_STATUS_REQUEST: - case OFPUTIL_NXT_STATUS_REPLY: - ofp_print_nxt_status_message(string, oh); - break; - - case OFPUTIL_NXT_TUN_ID_FROM_COOKIE: - ofp_print_nxt_tun_id_from_cookie(string, msg); - break; - case OFPUTIL_NXT_ROLE_REQUEST: case OFPUTIL_NXT_ROLE_REPLY: ofp_print_nxt_role_message(string, msg); break; + case OFPUTIL_NXT_FLOW_MOD_TABLE_ID: + ofp_print_nxt_flow_mod_table_id(string, msg); + break; + case OFPUTIL_NXT_SET_FLOW_FORMAT: ofp_print_nxt_set_flow_format(string, msg); break; @@ -1699,10 +1524,6 @@ ofp_to_string__(const struct ofp_header *oh, ofp_print_flow_mod(string, msg, code, verbosity); break; - case OFPUTIL_NXST_FLOW_REPLY: - ofp_print_nxst_flow_reply(string, oh); - break; - case OFPUTIL_NXST_AGGREGATE_REPLY: ofp_print_stats_reply(string, oh); ofp_print_nxst_aggregate_reply(string, msg);