X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fofp-print.c;h=870487816c641162a63ccfc5b770b099d3872d2a;hb=d295e8e97acae13552a5b220d3fbcff8201064a2;hp=90afec48d5ac430683e84780fd57049a8c5c8471;hpb=834377ea559d665520910968358c522f30d3eb93;p=openvswitch diff --git a/lib/ofp-print.c b/lib/ofp-print.c index 90afec48..87048781 100644 --- a/lib/ofp-print.c +++ b/lib/ofp-print.c @@ -16,10 +16,10 @@ #include #include "ofp-print.h" -#include "xtoxll.h" #include #include +#include #include #include #include @@ -35,6 +35,7 @@ #include "packets.h" #include "pcap.h" #include "util.h" +#include "xtoxll.h" static void ofp_print_port_name(struct ds *string, uint16_t port); @@ -92,7 +93,7 @@ ofp_packet_to_string(const void *data, size_t len, size_t total_len OVS_UNUSED) if (WEXITSTATUS(status)) ovs_error(0, "tcpdump exited with status %d", WEXITSTATUS(status)); } else if (WIFSIGNALED(status)) { - ovs_error(0, "tcpdump exited with signal %d", WTERMSIG(status)); + ovs_error(0, "tcpdump exited with signal %d", WTERMSIG(status)); } return ds_cstr(&ds); } @@ -133,20 +134,20 @@ ofp_packet_in(struct ds *string, const void *oh, size_t len, int verbosity) struct ofp_match match; packet.data = (void *) op->data; packet.size = data_len; - flow_extract(&packet, ntohs(op->in_port), &flow); - flow_to_match(&flow, 0, &match); + flow_extract(&packet, 0, ntohs(op->in_port), &flow); + flow_to_match(&flow, 0, false, &match); 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)); + ntohs(op->total_len)); ds_put_cstr(string, packet); free(packet); } } -static void ofp_print_port_name(struct ds *string, uint16_t port) +static void ofp_print_port_name(struct ds *string, uint16_t port) { const char *name; switch (port) { @@ -192,6 +193,13 @@ ofp_print_nx_action(struct ds *string, const struct nx_action_header *nah) break; } + case NXAST_SET_TUNNEL: { + const struct nx_action_set_tunnel *nast = + (struct nx_action_set_tunnel *)nah; + ds_put_format(string, "set_tunnel:0x%08"PRIx32, ntohl(nast->tun_id)); + break; + } + default: ds_put_format(string, "***unknown Nicira action:%d***\n", ntohs(nah->subtype)); @@ -199,8 +207,8 @@ ofp_print_nx_action(struct ds *string, const struct nx_action_header *nah) } static int -ofp_print_action(struct ds *string, const struct ofp_action_header *ah, - size_t actions_len) +ofp_print_action(struct ds *string, const struct ofp_action_header *ah, + size_t actions_len) { uint16_t type; size_t len; @@ -271,7 +279,7 @@ ofp_print_action(struct ds *string, const struct ofp_action_header *ah, } if ((len % 8) != 0) { - ds_put_format(string, + ds_put_format(string, "***action %"PRIu16" length not a multiple of 8***\n", type); return -1; @@ -280,16 +288,16 @@ ofp_print_action(struct ds *string, const struct ofp_action_header *ah, if (type < ARRAY_SIZE(of_actions)) { const struct openflow_action *act = &of_actions[type]; if ((len < act->min_size) || (len > act->max_size)) { - ds_put_format(string, + ds_put_format(string, "***action %"PRIu16" wrong length: %zu***\n", type, len); return -1; } } - + switch (type) { case OFPAT_OUTPUT: { struct ofp_action_output *oa = (struct ofp_action_output *)ah; - uint16_t port = ntohs(oa->port); + uint16_t port = ntohs(oa->port); if (port < OFPP_MAX) { ds_put_format(string, "output:%"PRIu16, port); } else { @@ -305,6 +313,20 @@ ofp_print_action(struct ds *string, const struct ofp_action_header *ah, break; } + case OFPAT_ENQUEUE: { + struct ofp_action_enqueue *ea = (struct ofp_action_enqueue *)ah; + unsigned int port = ntohs(ea->port); + unsigned int queue_id = ntohl(ea->queue_id); + ds_put_format(string, "enqueue:"); + if (port != OFPP_IN_PORT) { + ds_put_format(string, "%u", port); + } else { + ds_put_cstr(string, "IN_PORT"); + } + ds_put_format(string, "q%u", queue_id); + break; + } + case OFPAT_SET_VLAN_VID: { struct ofp_action_vlan_vid *va = (struct ofp_action_vlan_vid *)ah; ds_put_format(string, "mod_vlan_vid:%"PRIu16, ntohs(va->vlan_vid)); @@ -323,14 +345,14 @@ ofp_print_action(struct ds *string, const struct ofp_action_header *ah, case OFPAT_SET_DL_SRC: { struct ofp_action_dl_addr *da = (struct ofp_action_dl_addr *)ah; - ds_put_format(string, "mod_dl_src:"ETH_ADDR_FMT, + ds_put_format(string, "mod_dl_src:"ETH_ADDR_FMT, ETH_ADDR_ARGS(da->dl_addr)); break; } case OFPAT_SET_DL_DST: { struct ofp_action_dl_addr *da = (struct ofp_action_dl_addr *)ah; - ds_put_format(string, "mod_dl_dst:"ETH_ADDR_FMT, + ds_put_format(string, "mod_dl_dst:"ETH_ADDR_FMT, ETH_ADDR_ARGS(da->dl_addr)); break; } @@ -366,7 +388,7 @@ ofp_print_action(struct ds *string, const struct ofp_action_header *ah, } case OFPAT_VENDOR: { - struct ofp_action_vendor_header *avh + struct ofp_action_vendor_header *avh = (struct ofp_action_vendor_header *)ah; if (len < sizeof *avh) { ds_put_format(string, "***ofpat_vendor truncated***\n"); @@ -388,9 +410,9 @@ ofp_print_action(struct ds *string, const struct ofp_action_header *ah, return len; } -void +void ofp_print_actions(struct ds *string, const struct ofp_action_header *action, - size_t actions_len) + size_t actions_len) { uint8_t *p = (uint8_t *)action; int len = 0; @@ -403,7 +425,7 @@ ofp_print_actions(struct ds *string, const struct ofp_action_header *action, if (len) { ds_put_cstr(string, ","); } - len = ofp_print_action(string, (struct ofp_action_header *)p, + len = ofp_print_action(string, (struct ofp_action_header *)p, actions_len); if (len < 0) { return; @@ -416,7 +438,7 @@ ofp_print_actions(struct ds *string, const struct ofp_action_header *action, /* Pretty-print the OFPT_PACKET_OUT packet of 'len' bytes at 'oh' to 'string' * at the given 'verbosity' level. */ static void ofp_packet_out(struct ds *string, const void *oh, size_t len, - int verbosity) + int verbosity) { const struct ofp_packet_out *opo = oh; size_t actions_len = ntohs(opo->actions_len); @@ -552,7 +574,7 @@ ofp_print_switch_features(struct ds *string, const void *oh, size_t len, int n_ports; int i; - ds_put_format(string, " ver:0x%x, dpid:%016"PRIx64"\n", + ds_put_format(string, " ver:0x%x, dpid:%016"PRIx64"\n", osf->header.version, ntohll(osf->datapath_id)); ds_put_format(string, "n_tables:%d, n_buffers:%d\n", osf->n_tables, ntohl(osf->n_buffers)); @@ -564,7 +586,7 @@ ofp_print_switch_features(struct ds *string, const void *oh, size_t len, } n_ports = (len - sizeof *osf) / sizeof *osf->ports; - port_list = xmemdup(osf->ports, len - sizeof *osf); + port_list = xmemdup(osf->ports, len - sizeof *osf); qsort(port_list, n_ports, sizeof *port_list, compare_ports); for (i = 0; i < n_ports; i++) { ofp_print_phy_port(string, &port_list[i]); @@ -590,11 +612,11 @@ ofp_print_switch_config(struct ds *string, const void *oh, } static void print_wild(struct ds *string, const char *leader, int is_wild, - int verbosity, const char *format, ...) + int verbosity, const char *format, ...) __attribute__((format(printf, 5, 6))); static void print_wild(struct ds *string, const char *leader, int is_wild, - int verbosity, const char *format, ...) + int verbosity, const char *format, ...) { if (is_wild && verbosity < 2) { return; @@ -671,10 +693,13 @@ 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, - "0x%04x", ntohs(om->dl_vlan)); + "%d", ntohs(om->dl_vlan)); print_wild(&f, "dl_vlan_pcp=", w & OFPFW_DL_VLAN_PCP, verbosity, "%d", om->dl_vlan_pcp); print_wild(&f, "dl_src=", w & OFPFW_DL_SRC, verbosity, @@ -717,7 +742,7 @@ ofp_match_to_string(const struct ofp_match *om, int verbosity) /* Pretty-print the OFPT_FLOW_MOD packet of 'len' bytes at 'oh' to 'string' * at the given 'verbosity' level. */ static void -ofp_print_flow_mod(struct ds *string, const void *oh, size_t len, +ofp_print_flow_mod(struct ds *string, const void *oh, size_t len, int verbosity) { const struct ofp_flow_mod *ofm = oh; @@ -742,8 +767,8 @@ ofp_print_flow_mod(struct ds *string, const void *oh, size_t len, default: ds_put_format(string, " cmd:%d ", ntohs(ofm->command)); } - ds_put_format(string, "cookie:%"PRIx64" idle:%d hard:%d pri:%d " - "buf:%#x flags:%"PRIx16" ", ntohll(ofm->cookie), + ds_put_format(string, "cookie:0x%"PRIx64" idle:%d hard:%d pri:%d " + "buf:%#x flags:%"PRIx16" ", ntohll(ofm->cookie), ntohs(ofm->idle_timeout), ntohs(ofm->hard_timeout), ofm->match.wildcards ? ntohs(ofm->priority) : (uint16_t)-1, ntohl(ofm->buffer_id), ntohs(ofm->flags)); @@ -755,7 +780,7 @@ ofp_print_flow_mod(struct ds *string, const void *oh, size_t len, /* Pretty-print the OFPT_FLOW_REMOVED packet of 'len' bytes at 'oh' to 'string' * at the given 'verbosity' level. */ static void -ofp_print_flow_removed(struct ds *string, const void *oh, +ofp_print_flow_removed(struct ds *string, const void *oh, size_t len OVS_UNUSED, int verbosity) { const struct ofp_flow_removed *ofr = oh; @@ -776,13 +801,13 @@ ofp_print_flow_removed(struct ds *string, const void *oh, ds_put_format(string, "**%"PRIu8"**", ofr->reason); break; } - ds_put_format(string, - " cookie%"PRIx64" pri%"PRIu16" secs%"PRIu32" nsecs%"PRIu32 - " idle%"PRIu16" pkts%"PRIu64" bytes%"PRIu64"\n", + ds_put_format(string, + " cookie0x%"PRIx64" pri%"PRIu16" secs%"PRIu32" nsecs%"PRIu32 + " idle%"PRIu16" pkts%"PRIu64" bytes%"PRIu64"\n", ntohll(ofr->cookie), ofr->match.wildcards ? ntohs(ofr->priority) : (uint16_t)-1, ntohl(ofr->duration_sec), ntohl(ofr->duration_nsec), - ntohs(ofr->idle_timeout), ntohll(ofr->packet_count), + ntohs(ofr->idle_timeout), ntohll(ofr->packet_count), ntohll(ofr->byte_count)); } @@ -793,7 +818,7 @@ ofp_print_port_mod(struct ds *string, const void *oh, size_t len OVS_UNUSED, const struct ofp_port_mod *opm = oh; ds_put_format(string, "port: %d: addr:"ETH_ADDR_FMT", config: %#x, mask:%#x\n", - ntohs(opm->port_no), ETH_ADDR_ARGS(opm->hw_addr), + ntohs(opm->port_no), ETH_ADDR_ARGS(opm->hw_addr), ntohl(opm->config), ntohl(opm->mask)); ds_put_format(string, " advertise: "); if (opm->advertise) { @@ -879,7 +904,7 @@ lookup_error_code(int type, int code) /* Pretty-print the OFPT_ERROR packet of 'len' bytes at 'oh' to 'string' * at the given 'verbosity' level. */ static void -ofp_print_error_msg(struct ds *string, const void *oh, size_t len, +ofp_print_error_msg(struct ds *string, const void *oh, size_t len, int verbosity OVS_UNUSED) { const struct ofp_error_msg *oem = oh; @@ -933,11 +958,16 @@ ofp_desc_stats_reply(struct ds *string, const void *body, { 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); - ds_put_format(string, "DP Description: %s\n", ods->dp_desc); + ds_put_format(string, "Manufacturer: %.*s\n", + (int) sizeof ods->mfr_desc, ods->mfr_desc); + ds_put_format(string, "Hardware: %.*s\n", + (int) sizeof ods->hw_desc, ods->hw_desc); + ds_put_format(string, "Software: %.*s\n", + (int) sizeof ods->sw_desc, ods->sw_desc); + ds_put_format(string, "Serial Num: %.*s\n", + (int) sizeof ods->serial_num, ods->serial_num); + ds_put_format(string, "DP Description: %.*s\n", + (int) sizeof ods->dp_desc, ods->dp_desc); } static void @@ -994,13 +1024,13 @@ ofp_flow_stats_reply(struct ds *string, const void *body_, size_t len, break; } - ds_put_format(string, " cookie=%"PRIu64"s, ", ntohll(fs->cookie)); - ds_put_format(string, "duration_sec=%"PRIu32"s, ", + ds_put_format(string, " cookie=0x%"PRIx64", ", ntohll(fs->cookie)); + ds_put_format(string, "duration_sec=%"PRIu32"s, ", ntohl(fs->duration_sec)); - ds_put_format(string, "duration_nsec=%"PRIu32"s, ", + ds_put_format(string, "duration_nsec=%"PRIu32"ns, ", ntohl(fs->duration_nsec)); ds_put_format(string, "table_id=%"PRIu8", ", fs->table_id); - ds_put_format(string, "priority=%"PRIu16", ", + ds_put_format(string, "priority=%"PRIu16", ", fs->match.wildcards ? ntohs(fs->priority) : (uint16_t)-1); ds_put_format(string, "n_packets=%"PRIu64", ", ntohll(fs->packet_count)); @@ -1047,7 +1077,7 @@ ofp_aggregate_stats_reply(struct ds *string, const void *body_, ds_put_format(string, " flow_count=%"PRIu32, ntohl(asr->flow_count)); } -static void print_port_stat(struct ds *string, const char *leader, +static void print_port_stat(struct ds *string, const char *leader, uint64_t stat, int more) { ds_put_cstr(string, leader); @@ -1063,6 +1093,14 @@ static void print_port_stat(struct ds *string, const char *leader, } } +static void +ofp_port_stats_request(struct ds *string, const void *body_, + size_t len OVS_UNUSED, int verbosity OVS_UNUSED) +{ + const struct ofp_port_stats_request *psr = body_; + ds_put_format(string, "port_no=%"PRIu16, ntohs(psr->port_no)); +} + static void ofp_port_stats_reply(struct ds *string, const void *body, size_t len, int verbosity) @@ -1116,7 +1154,7 @@ ofp_table_stats_reply(struct ds *string, const void *body, size_t len, 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", ", + ds_put_format(string, "lookup=%"PRIu64", ", ntohll(ts->lookup_count)); ds_put_format(string, "matched=%"PRIu64"\n", ntohll(ts->matched_count)); @@ -1187,7 +1225,9 @@ print_stats(struct ds *string, int type, const void *body, size_t body_len, { OFPST_PORT, "port", - { 0, 0, NULL, }, + { sizeof(struct ofp_port_stats_request), + sizeof(struct ofp_port_stats_request), + ofp_port_stats_request }, { 0, SIZE_MAX, ofp_port_stats_reply }, }, { @@ -1275,7 +1315,7 @@ ofp_echo(struct ds *string, const void *oh, size_t len, int verbosity) ds_put_format(string, " %zu bytes of payload\n", len - sizeof *hdr); if (verbosity > 1) { - ds_put_hex_dump(string, hdr, len - sizeof *hdr, 0, true); + ds_put_hex_dump(string, hdr, len - sizeof *hdr, 0, true); } } @@ -1458,7 +1498,7 @@ ofp_to_string(const void *oh_, size_t len, int verbosity) } else if (!pkt->printer) { if (len > sizeof *oh) { ds_put_format(&string, " length=%"PRIu16" (decoder not implemented)\n", - ntohs(oh->length)); + ntohs(oh->length)); } } else { pkt->printer(&string, oh, len, verbosity); @@ -1500,7 +1540,7 @@ ofp_message_type_to_string(uint8_t type) } static void -print_and_free(FILE *stream, char *string) +print_and_free(FILE *stream, char *string) { fputs(string, stream); free(string);