X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fofp-print.c;h=30da724e84630b06d91e7ed318bb2b06f4fd011f;hb=675baf0cdf570ca7c979a5bd18a62d230fd91632;hp=d4f33daa970bf7baa1d1c5ce192099f45994fca2;hpb=54ae6fa8f1ae7401652d282609848605fc283104;p=openvswitch diff --git a/lib/ofp-print.c b/lib/ofp-print.c index d4f33daa..30da724e 100644 --- a/lib/ofp-print.c +++ b/lib/ofp-print.c @@ -82,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); @@ -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); @@ -219,6 +218,7 @@ nx_action_len(enum nx_action_subtype subtype) 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; } } @@ -226,7 +226,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); @@ -244,6 +244,7 @@ ofp_print_nx_action(struct ds *string, const struct nx_action_header *nah) 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: @@ -257,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)); @@ -295,13 +292,23 @@ ofp_print_nx_action(struct ds *string, const struct nx_action_header *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: + case NXAST_DROP_SPOOFED_ARP__OBSOLETE: default: break; } } - ds_put_format(string, "***unknown Nicira action:%"PRIu16"***", subtype); + ds_put_format(string, "***unknown Nicira action:%d***", subtype); } static int @@ -603,7 +610,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; } } @@ -711,7 +718,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) { @@ -769,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, @@ -826,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); + error = ofputil_decode_flow_mod(&fm, oh, true); if (error) { ofp_print_error(s, error); return; @@ -852,6 +856,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) { @@ -923,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; @@ -1059,7 +1066,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; @@ -1083,145 +1090,43 @@ ofp_print_flow_stats_request(struct ds *string, const struct ofp_header *oh) } 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(get_32aligned_be64(&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(get_32aligned_be64(&fs->packet_count))); - ds_put_format(string, "n_bytes=%"PRIu64", ", - ntohll(get_32aligned_be64(&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)); - } - if (fs->hard_timeout != htons(OFP_FLOW_PERMANENT)) { - ds_put_format(string, "hard_timeout=%"PRIu16",", - ntohs(fs->hard_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); } - - 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); } } @@ -1246,7 +1151,9 @@ 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, @@ -1382,8 +1289,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"***", @@ -1394,7 +1300,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); @@ -1422,25 +1328,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(struct nicira_header)); - ds_put_cstr(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) @@ -1459,6 +1346,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) @@ -1585,8 +1479,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: @@ -1609,20 +1504,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; @@ -1631,10 +1521,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);