X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fofp-print.c;h=2729c14b82eb558ea19d1126fc68d2a6e0421990;hb=eb0341e7118a5a63e7a2696e3e59940668355cba;hp=2af4553f491885c0d7bb17f916fb67d7d16a0b23;hpb=be25fa83e8f65d92b853bd20a3d1a594af352b92;p=sliver-openvswitch.git diff --git a/lib/ofp-print.c b/lib/ofp-print.c index 2af4553f4..2729c14b8 100644 --- a/lib/ofp-print.c +++ b/lib/ofp-print.c @@ -45,11 +45,15 @@ #include "compiler.h" #include "dynamic-string.h" -#include "util.h" +#include "flow.h" +#include "ofpbuf.h" #include "openflow.h" #include "packets.h" +#include "util.h" static void ofp_print_port_name(struct ds *string, uint16_t port); +static void ofp_print_match(struct ds *, const struct ofp_match *, + int verbosity); /* Returns a string that represents the contents of the Ethernet frame in the * 'len' bytes starting at 'data' to 'stream' as output by tcpdump. @@ -92,7 +96,7 @@ ofp_packet_to_string(const void *data, size_t len, size_t total_len) pcap = tmpfile(); if (!pcap) { - error(errno, "tmpfile"); + ofp_error(errno, "tmpfile"); return xstrdup(""); } @@ -117,7 +121,7 @@ ofp_packet_to_string(const void *data, size_t len, size_t total_len) fflush(pcap); if (ferror(pcap)) { - error(errno, "error writing temporary file"); + ofp_error(errno, "error writing temporary file"); } rewind(pcap); @@ -126,7 +130,7 @@ ofp_packet_to_string(const void *data, size_t len, size_t total_len) tcpdump = popen(command, "r"); fclose(pcap); if (!tcpdump) { - error(errno, "exec(\"%s\")", command); + ofp_error(errno, "exec(\"%s\")", command); return xstrdup(""); } @@ -137,9 +141,9 @@ ofp_packet_to_string(const void *data, size_t len, size_t total_len) status = pclose(tcpdump); if (WIFEXITED(status)) { if (WEXITSTATUS(status)) - error(0, "tcpdump exited with status %d", WEXITSTATUS(status)); + ofp_error(0, "tcpdump exited with status %d", WEXITSTATUS(status)); } else if (WIFSIGNALED(status)) { - error(0, "tcpdump exited with signal %d", WTERMSIG(status)); + ofp_error(0, "tcpdump exited with signal %d", WTERMSIG(status)); } return ds_cstr(&ds); } @@ -168,13 +172,35 @@ ofp_packet_in(struct ds *string, const void *oh, size_t len, int verbosity) if (ntohs(op->total_len) != data_len) ds_put_format(string, " (***total_len != data_len***)"); } else { - ds_put_format(string, " buffer=%08"PRIx32, ntohl(op->buffer_id)); + ds_put_format(string, " buffer=0x%08"PRIx32, ntohl(op->buffer_id)); if (ntohs(op->total_len) < data_len) ds_put_format(string, " (***total_len < data_len***)"); } ds_put_char(string, '\n'); if (verbosity > 0) { + struct flow flow; + struct ofpbuf packet; + struct ofp_match match; + packet.data = (void *) op->data; + packet.size = data_len; + flow_extract(&packet, ntohs(op->in_port), &flow); + match.wildcards = 0; + match.in_port = flow.in_port; + memcpy(match.dl_src, flow.dl_src, ETH_ADDR_LEN); + memcpy(match.dl_dst, flow.dl_dst, ETH_ADDR_LEN); + match.dl_vlan = flow.dl_vlan; + match.dl_type = flow.dl_type; + match.nw_proto = flow.nw_proto; + match.pad = 0; + match.nw_src = flow.nw_src; + match.nw_dst = flow.nw_dst; + match.tp_src = flow.tp_src; + match.tp_dst = flow.tp_dst; + ofp_print_match(string, &match, verbosity); + ds_put_char(string, '\n'); + } + if (verbosity > 1) { char *packet = ofp_packet_to_string(op->data, data_len, ntohs(op->total_len)); ds_put_cstr(string, packet); @@ -186,6 +212,9 @@ static void ofp_print_port_name(struct ds *string, uint16_t port) { const char *name; switch (port) { + case OFPP_IN_PORT: + name = "IN_PORT"; + break; case OFPP_TABLE: name = "TABLE"; break; @@ -257,11 +286,11 @@ ofp_print_action(struct ds *string, const struct ofp_action *a) break; case OFPAT_SET_NW_SRC: - ds_put_format(string, "mod_nw_src:"IP_FMT, IP_ARGS(a->arg.nw_addr)); + ds_put_format(string, "mod_nw_src:"IP_FMT, IP_ARGS(&a->arg.nw_addr)); break; case OFPAT_SET_NW_DST: - ds_put_format(string, "mod_nw_dst:"IP_FMT, IP_ARGS(a->arg.nw_addr)); + ds_put_format(string, "mod_nw_dst:"IP_FMT, IP_ARGS(&a->arg.nw_addr)); break; case OFPAT_SET_TP_SRC: @@ -307,23 +336,31 @@ static void ofp_packet_out(struct ds *string, const void *oh, size_t len, int verbosity) { const struct ofp_packet_out *opo = oh; + int n_actions = ntohs(opo->n_actions); + int act_len = n_actions * sizeof opo->actions[0]; ds_put_cstr(string, " in_port="); ofp_print_port_name(string, ntohs(opo->in_port)); + ds_put_format(string, " n_actions=%d ", n_actions); + if (act_len > (ntohs(opo->header.length) - sizeof *opo)) { + ds_put_format(string, "***packet too short for number of actions***\n"); + return; + } + ofp_print_actions(string, opo->actions, act_len); + if (ntohl(opo->buffer_id) == UINT32_MAX) { - ds_put_cstr(string, " out_port="); - ofp_print_port_name(string, ntohs(opo->out_port)); + int data_len = len - sizeof *opo - act_len; + ds_put_format(string, " data_len=%d", data_len); if (verbosity > 0 && len > sizeof *opo) { - char *packet = ofp_packet_to_string(opo->u.data, len - sizeof *opo, - len - sizeof *opo); + char *packet = ofp_packet_to_string(&opo->actions[n_actions], + data_len, data_len); ds_put_char(string, '\n'); ds_put_cstr(string, packet); free(packet); } } else { - ds_put_format(string, " buffer=%08"PRIx32, ntohl(opo->buffer_id)); - ofp_print_actions(string, opo->u.actions, len - sizeof *opo); + ds_put_format(string, " buffer=0x%08"PRIx32, ntohl(opo->buffer_id)); } ds_put_char(string, '\n'); } @@ -409,7 +446,7 @@ ofp_print_switch_config(struct ds *string, const void *oh, size_t len, ds_put_format(string, " (sending flow expirations)"); } if (flags) { - ds_put_format(string, " ***unknown flags %04"PRIx16"***", flags); + ds_put_format(string, " ***unknown flags 0x%04"PRIx16"***", flags); } ds_put_format(string, " miss_send_len=%"PRIu16"\n", ntohs(osc->miss_send_len)); @@ -435,34 +472,84 @@ static void print_wild(struct ds *string, const char *leader, int is_wild, } else { ds_put_char(string, '*'); } + ds_put_char(string, ','); +} + +static void +print_ip_netmask(struct ds *string, const char *leader, uint32_t ip, + uint32_t wild_bits, int verbosity) +{ + if (wild_bits >= 32 && verbosity < 2) { + return; + } + ds_put_cstr(string, leader); + if (wild_bits < 32) { + ds_put_format(string, IP_FMT, IP_ARGS(&ip)); + if (wild_bits) { + ds_put_format(string, "/%d", 32 - wild_bits); + } + } else { + ds_put_char(string, '*'); + } + ds_put_char(string, ','); } /* Pretty-print the ofp_match structure */ static void ofp_print_match(struct ds *f, const struct ofp_match *om, int verbosity) { - uint16_t w = ntohs(om->wildcards); - + uint32_t w = ntohl(om->wildcards); + bool skip_type = false; + bool skip_proto = false; + + if (!(w & OFPFW_DL_TYPE)) { + skip_type = true; + if (om->dl_type == htons(ETH_TYPE_IP)) { + if (!(w & OFPFW_NW_PROTO)) { + skip_proto = true; + if (om->nw_proto == IP_TYPE_ICMP) { + ds_put_cstr(f, "icmp,"); + } else if (om->nw_proto == IP_TYPE_TCP) { + ds_put_cstr(f, "tcp,"); + } else if (om->nw_proto == IP_TYPE_UDP) { + ds_put_cstr(f, "udp,"); + } else { + ds_put_cstr(f, "ip,"); + skip_proto = false; + } + } else { + ds_put_cstr(f, "ip,"); + } + } else if (om->dl_type == htons(ETH_TYPE_ARP)) { + ds_put_cstr(f, "arp,"); + } else { + skip_type = false; + } + } print_wild(f, "in_port=", w & OFPFW_IN_PORT, verbosity, - "%d,", ntohs(om->in_port)); + "%d", ntohs(om->in_port)); print_wild(f, "dl_vlan=", w & OFPFW_DL_VLAN, verbosity, - "%04x,", ntohs(om->dl_vlan)); + "0x%04x", ntohs(om->dl_vlan)); print_wild(f, "dl_src=", w & OFPFW_DL_SRC, verbosity, - ETH_ADDR_FMT",", ETH_ADDR_ARGS(om->dl_src)); + ETH_ADDR_FMT, ETH_ADDR_ARGS(om->dl_src)); print_wild(f, "dl_dst=", w & OFPFW_DL_DST, verbosity, - ETH_ADDR_FMT",", ETH_ADDR_ARGS(om->dl_dst)); - print_wild(f, "dl_type=", w & OFPFW_DL_TYPE, verbosity, - "%04x,", ntohs(om->dl_type)); - print_wild(f, "nw_src=", w & OFPFW_NW_SRC, verbosity, - IP_FMT",", IP_ARGS(&om->nw_src)); - print_wild(f, "nw_dst=", w & OFPFW_NW_DST, verbosity, - IP_FMT",", IP_ARGS(&om->nw_dst)); - print_wild(f, "nw_proto=", w & OFPFW_NW_PROTO, verbosity, - "%u,", om->nw_proto); + ETH_ADDR_FMT, ETH_ADDR_ARGS(om->dl_dst)); + if (!skip_type) { + print_wild(f, "dl_type=", w & OFPFW_DL_TYPE, verbosity, + "0x%04x", ntohs(om->dl_type)); + } + print_ip_netmask(f, "nw_src=", om->nw_src, + (w & OFPFW_NW_SRC_MASK) >> OFPFW_NW_SRC_SHIFT, verbosity); + print_ip_netmask(f, "nw_dst=", om->nw_dst, + (w & OFPFW_NW_DST_MASK) >> OFPFW_NW_DST_SHIFT, verbosity); + if (!skip_proto) { + print_wild(f, "nw_proto=", w & OFPFW_NW_PROTO, verbosity, + "%u", om->nw_proto); + } print_wild(f, "tp_src=", w & OFPFW_TP_SRC, verbosity, - "%d,", ntohs(om->tp_src)); + "%d", ntohs(om->tp_src)); print_wild(f, "tp_dst=", w & OFPFW_TP_DST, verbosity, - "%d,", ntohs(om->tp_dst)); + "%d", ntohs(om->tp_dst)); } /* Pretty-print the OFPT_FLOW_MOD packet of 'len' bytes at 'oh' to 'string' @@ -474,8 +561,9 @@ ofp_print_flow_mod(struct ds *string, const void *oh, size_t len, const struct ofp_flow_mod *ofm = oh; ofp_print_match(string, &ofm->match, verbosity); - ds_put_format(string, " cmd:%d idle:%d pri:%d buf:%#x", - ntohs(ofm->command), ntohs(ofm->max_idle), + ds_put_format(string, " cmd:%d idle:%d hard:%d pri:%d buf:%#x", + ntohs(ofm->command), ntohs(ofm->idle_timeout), + ntohs(ofm->hard_timeout), ofm->match.wildcards ? ntohs(ofm->priority) : (uint16_t)-1, ntohl(ofm->buffer_id)); ofp_print_actions(string, ofm->actions, @@ -492,6 +580,18 @@ ofp_print_flow_expired(struct ds *string, const void *oh, size_t len, const struct ofp_flow_expired *ofe = oh; ofp_print_match(string, &ofe->match, verbosity); + ds_put_cstr(string, " reason="); + switch (ofe->reason) { + case OFPER_IDLE_TIMEOUT: + ds_put_cstr(string, "idle"); + break; + case OFPER_HARD_TIMEOUT: + ds_put_cstr(string, "hard"); + break; + default: + ds_put_format(string, "**%"PRIu8"**", ofe->reason); + break; + } ds_put_format(string, " pri%"PRIu16" secs%"PRIu32" pkts%"PRIu64" bytes%"PRIu64"\n", ofe->match.wildcards ? ntohs(ofe->priority) : (uint16_t)-1, @@ -532,6 +632,18 @@ ofp_print_port_status(struct ds *string, const void *oh, size_t len, ofp_print_phy_port(string, &ops->desc); } +static void +ofp_desc_stats_reply(struct ds *string, const void *body, size_t len, + int verbosity) +{ + const struct ofp_desc_stats *ods = body; + + ds_put_format(string, "Manufacturer: %s\n", ods->mfr_desc); + ds_put_format(string, "Hardware: %s\n", ods->hw_desc); + ds_put_format(string, "Software: %s\n", ods->sw_desc); + ds_put_format(string, "Serial Num: %s\n", ods->serial_num); +} + static void ofp_flow_stats_request(struct ds *string, const void *oh, size_t len, int verbosity) @@ -593,7 +705,10 @@ ofp_flow_stats_reply(struct ds *string, const void *body_, size_t len, ds_put_format(string, "n_packets=%"PRIu64", ", ntohll(fs->packet_count)); ds_put_format(string, "n_bytes=%"PRIu64", ", ntohll(fs->byte_count)); - ds_put_format(string, "max_idle=%"PRIu16",", ntohs(fs->max_idle)); + ds_put_format(string, "idle_timeout=%"PRIu16",", + ntohs(fs->idle_timeout)); + ds_put_format(string, "hard_timeout=%"PRIu16",", + ntohs(fs->hard_timeout)); ofp_print_match(string, &fs->match, verbosity); ofp_print_actions(string, fs->actions, length - sizeof *fs); ds_put_char(string, '\n'); @@ -628,6 +743,22 @@ ofp_aggregate_stats_reply(struct ds *string, const void *body_, size_t len, ds_put_format(string, " flow_count=%"PRIu32, ntohl(asr->flow_count)); } +static void print_port_stat(struct ds *string, const char *leader, + uint64_t stat, int more) +{ + ds_put_cstr(string, leader); + if (stat != -1) { + ds_put_format(string, "%"PRIu64, stat); + } else { + ds_put_char(string, '?'); + } + if (more) { + ds_put_cstr(string, ", "); + } else { + ds_put_cstr(string, "\n"); + } +} + static void ofp_port_stats_reply(struct ds *string, const void *body, size_t len, int verbosity) @@ -640,10 +771,23 @@ ofp_port_stats_reply(struct ds *string, const void *body, size_t len, } for (; n--; ps++) { - ds_put_format(string, " port %"PRIu16": ", ntohs(ps->port_no)); - ds_put_format(string, "rx %"PRIu64", ", ntohll(ps->rx_count)); - ds_put_format(string, "tx %"PRIu64", ", ntohll(ps->tx_count)); - ds_put_format(string, "dropped %"PRIu64"\n", ntohll(ps->drop_count)); + 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); + + 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); } } @@ -672,6 +816,22 @@ ofp_table_stats_reply(struct ds *string, const void *body, size_t len, } } +static void +switch_status_reply(struct ds *string, const void *body, size_t len, + int verbosity UNUSED) +{ + char *save_ptr = NULL; + char *s, *line; + + s = xmemdup0(body, len); + for (line = strtok_r(s, "\n\n", &save_ptr); line != NULL; + line = strtok_r(NULL, "\n\n", &save_ptr)) { + ds_put_printable(string, line, strlen(line)); + ds_put_char(string, '\n'); + } + free(s); +} + enum stats_direction { REQUEST, REPLY @@ -693,6 +853,11 @@ print_stats(struct ds *string, int type, const void *body, size_t body_len, }; static const struct stats_type stats_types[] = { + [OFPST_DESC] = { + "description", + { 0, 0, NULL }, + { 0, SIZE_MAX, ofp_desc_stats_reply }, + }, [OFPST_FLOW] = { "flow", { sizeof(struct ofp_flow_stats_request), @@ -719,6 +884,11 @@ print_stats(struct ds *string, int type, const void *body, size_t body_len, { 0, 0, NULL, }, { 0, SIZE_MAX, ofp_port_stats_reply }, }, + [OFPST_SWITCH] = { + "switch status", + { 0, 0, NULL, }, + { 0, SIZE_MAX, switch_status_reply }, + }, }; const struct stats_type *s; @@ -748,7 +918,7 @@ ofp_stats_request(struct ds *string, const void *oh, size_t len, int verbosity) const struct ofp_stats_request *srq = oh; if (srq->flags) { - ds_put_format(string, " ***unknown flags %04"PRIx16"***", + ds_put_format(string, " ***unknown flags 0x%04"PRIx16"***", ntohs(srq->flags)); } @@ -772,7 +942,7 @@ ofp_stats_reply(struct ds *string, const void *oh, size_t len, int verbosity) flags &= ~OFPSF_REPLY_MORE; } if (flags) { - ds_put_format(string, "[***unknown%04"PRIx16"***]", flags); + ds_put_format(string, "[***unknown flags 0x%04"PRIx16"***]", flags); } } @@ -908,7 +1078,7 @@ ofp_to_string(const void *oh_, size_t len, int verbosity) } pkt = &packets[oh->type]; - ds_put_format(&string, "%s (xid=%"PRIx32"):", pkt->name, oh->xid); + ds_put_format(&string, "%s (xid=0x%"PRIx32"):", pkt->name, oh->xid); if (ntohs(oh->length) > len) ds_put_format(&string, " (***truncated to %zu bytes from %"PRIu16"***)",