X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-ofctl.c;h=5eb8cf4aee7be25860a16e54a6d48c1fe45edf78;hb=4f6b99348189f728a734aaf3b551410ee8b07f0c;hp=9294752323f7adc2eca38eade13101d9f6e27503;hpb=7395c05254df87ce52b37b04478e802befd799d9;p=sliver-openvswitch.git diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c index 929475232..5eb8cf4ae 100644 --- a/utilities/ovs-ofctl.c +++ b/utilities/ovs-ofctl.c @@ -50,6 +50,7 @@ #include "openflow/nicira-ext.h" #include "openflow/openflow.h" #include "packets.h" +#include "pcap-file.h" #include "poll-loop.h" #include "random.h" #include "stream-ssl.h" @@ -281,6 +282,7 @@ usage(void) " dump-desc SWITCH print switch description\n" " dump-tables SWITCH print table stats\n" " mod-port SWITCH IFACE ACT modify port behavior\n" + " mod-table SWITCH MOD modify flow table behavior\n" " get-frags SWITCH print fragment handling behavior\n" " set-frags SWITCH FRAG_MODE set fragment handling behavior\n" " dump-ports SWITCH [PORT] print port statistics\n" @@ -308,6 +310,15 @@ usage(void) " dump-group-features SWITCH print group features\n" " dump-groups SWITCH print group description\n" " dump-group-stats SWITCH [GROUP] print group statistics\n" + " queue-get-config SWITCH PORT print queue information for port\n" + " add-meter SWITCH METER add meter described by METER\n" + " mod-meter SWITCH METER modify specific METER\n" + " del-meter SWITCH METER delete METER\n" + " del-meters SWITCH delete all meters\n" + " dump-meter SWITCH METER print METER configuration\n" + " dump-meters SWITCH print all meter configuration\n" + " meter-stats SWITCH [METER] print meter statistics\n" + " meter-features SWITCH print meter features\n" "\nFor OpenFlow switches and controllers:\n" " probe TARGET probe whether TARGET is up\n" " ping TARGET [N] latency of N-byte echos\n" @@ -1036,6 +1047,26 @@ ofctl_queue_stats(int argc, char *argv[]) vconn_close(vconn); } +static void +ofctl_queue_get_config(int argc OVS_UNUSED, char *argv[]) +{ + const char *vconn_name = argv[1]; + const char *port_name = argv[2]; + enum ofputil_protocol protocol; + enum ofp_version version; + struct ofpbuf *request; + struct vconn *vconn; + ofp_port_t port; + + port = str_to_port_no(vconn_name, port_name); + + protocol = open_vconn(vconn_name, &vconn); + version = ofputil_protocol_to_ofp_version(protocol); + request = ofputil_encode_queue_get_config_request(version, port); + dump_transaction(vconn, request); + vconn_close(vconn); +} + static enum ofputil_protocol open_vconn_for_flow_mod(const char *remote, struct vconn **vconnp, enum ofputil_protocol usable_protocols) @@ -1112,13 +1143,12 @@ ofctl_flow_mod_file(int argc OVS_UNUSED, char *argv[], uint16_t command) static void ofctl_flow_mod(int argc, char *argv[], uint16_t command) { - enum ofputil_protocol usable_protocols; - if (argc > 2 && !strcmp(argv[2], "-")) { ofctl_flow_mod_file(argc, argv, command); } else { struct ofputil_flow_mod fm; char *error; + enum ofputil_protocol usable_protocols; error = parse_ofp_flow_mod_str(&fm, argc > 2 ? argv[2] : "", command, &usable_protocols); @@ -1395,7 +1425,8 @@ monitor_vconn(struct vconn *vconn, bool reply_to_echo_requests) run(retval, "vconn_recv"); if (timestamp) { - char *s = xastrftime("%Y-%m-%d %H:%M:%S: ", time_wall(), true); + char *s = xastrftime_msec("%Y-%m-%d %H:%M:%S.###: ", + time_wall_msec(), true); fputs(s, stderr); free(s); } @@ -1663,6 +1694,42 @@ found: vconn_close(vconn); } +static void +ofctl_mod_table(int argc OVS_UNUSED, char *argv[]) +{ + enum ofputil_protocol protocol, usable_protocols; + struct ofputil_table_mod tm; + struct vconn *vconn; + char *error; + int i; + + error = parse_ofp_table_mod(&tm, argv[2], argv[3], &usable_protocols); + if (error) { + ovs_fatal(0, "%s", error); + } + + protocol = open_vconn(argv[1], &vconn); + if (!(protocol & usable_protocols)) { + for (i = 0; i < sizeof(enum ofputil_protocol) * CHAR_BIT; i++) { + enum ofputil_protocol f = 1 << i; + if (f != protocol + && f & usable_protocols + && try_set_protocol(vconn, f, &protocol)) { + protocol = f; + break; + } + } + } + + if (!(protocol & usable_protocols)) { + char *usable_s = ofputil_protocols_to_string(usable_protocols); + ovs_fatal(0, "Switch does not support table mod message(%s)", usable_s); + } + + transact_noreply(vconn, ofputil_encode_table_mod(&tm, protocol)); + vconn_close(vconn); +} + static void ofctl_get_frags(int argc OVS_UNUSED, char *argv[]) { @@ -1738,7 +1805,7 @@ ofctl_ofp_parse(int argc OVS_UNUSED, char *argv[]) length = ntohs(oh->length); if (length < sizeof *oh) { - ovs_fatal(0, "%s: %zu-byte message is too short for OpenFlow", + ovs_fatal(0, "%s: %"PRIuSIZE"-byte message is too short for OpenFlow", filename, length); } @@ -1768,7 +1835,7 @@ ofctl_ping(int argc, char *argv[]) payload = argc > 2 ? atoi(argv[2]) : 64; if (payload > max_payload) { - ovs_fatal(0, "payload must be between 0 and %zu bytes", max_payload); + ovs_fatal(0, "payload must be between 0 and %"PRIuSIZE" bytes", max_payload); } open_vconn(argv[1], &vconn); @@ -1796,7 +1863,7 @@ ofctl_ping(int argc, char *argv[]) printf("Reply:\n"); ofp_print(stdout, reply, reply->size, verbosity + 2); } - printf("%zu bytes from %s: xid=%08"PRIx32" time=%.1f ms\n", + printf("%"PRIuSIZE" bytes from %s: xid=%08"PRIx32" time=%.1f ms\n", reply->size, argv[1], ntohl(rpy_hdr->xid), (1000*(double)(end.tv_sec - start.tv_sec)) + (.001*(end.tv_usec - start.tv_usec))); @@ -1819,7 +1886,7 @@ ofctl_benchmark(int argc OVS_UNUSED, char *argv[]) payload_size = atoi(argv[2]); if (payload_size > max_payload) { - ovs_fatal(0, "payload must be between 0 and %zu bytes", max_payload); + ovs_fatal(0, "payload must be between 0 and %"PRIuSIZE" bytes", max_payload); } message_size = sizeof(struct ofp_header) + payload_size; @@ -2067,7 +2134,7 @@ fte_version_format(const struct fte *fte, int index, struct ds *s) ds_put_format(s, " hard_timeout=%"PRIu16, version->hard_timeout); } - ds_put_char(s, ' '); + ds_put_cstr(s, " actions="); ofpacts_format(version->ofpacts, version->ofpacts_len, s); ds_put_char(s, '\n'); @@ -2325,7 +2392,7 @@ ofctl_replace_flows(int argc OVS_UNUSED, char *argv[]) struct vconn *vconn; struct fte *fte; - classifier_init(&cls); + classifier_init(&cls, NULL); usable_protocols = read_flows_from_file(argv[2], &cls, FILE_IDX); protocol = open_vconn(argv[1], &vconn); @@ -2395,7 +2462,7 @@ ofctl_diff_flows(int argc OVS_UNUSED, char *argv[]) struct ds a_s, b_s; struct fte *fte; - classifier_init(&cls); + classifier_init(&cls, NULL); read_flows_from_source(argv[1], &cls, 0); read_flows_from_source(argv[2], &cls, 1); @@ -2433,6 +2500,102 @@ ofctl_diff_flows(int argc OVS_UNUSED, char *argv[]) exit(2); } } + +static void +ofctl_meter_mod__(const char *bridge, const char *str, int command) +{ + struct ofputil_meter_mod mm; + struct vconn *vconn; + enum ofputil_protocol protocol; + enum ofputil_protocol usable_protocols; + enum ofp_version version; + + if (str) { + char *error; + error = parse_ofp_meter_mod_str(&mm, str, command, &usable_protocols); + if (error) { + ovs_fatal(0, "%s", error); + } + } else { + usable_protocols = OFPUTIL_P_OF13_UP; + mm.command = command; + mm.meter.meter_id = OFPM13_ALL; + } + + protocol = open_vconn_for_flow_mod(bridge, &vconn, usable_protocols); + version = ofputil_protocol_to_ofp_version(protocol); + transact_noreply(vconn, ofputil_encode_meter_mod(version, &mm)); + vconn_close(vconn); +} + +static void +ofctl_meter_request__(const char *bridge, const char *str, + enum ofputil_meter_request_type type) +{ + struct ofputil_meter_mod mm; + struct vconn *vconn; + enum ofputil_protocol usable_protocols; + enum ofputil_protocol protocol; + enum ofp_version version; + + if (str) { + char *error; + error = parse_ofp_meter_mod_str(&mm, str, -1, &usable_protocols); + if (error) { + ovs_fatal(0, "%s", error); + } + } else { + usable_protocols = OFPUTIL_P_OF13_UP; + mm.meter.meter_id = OFPM13_ALL; + } + + protocol = open_vconn_for_flow_mod(bridge, &vconn, usable_protocols); + version = ofputil_protocol_to_ofp_version(protocol); + transact_noreply(vconn, ofputil_encode_meter_request(version, + type, + mm.meter.meter_id)); + vconn_close(vconn); +} + + +static void +ofctl_add_meter(int argc OVS_UNUSED, char *argv[]) +{ + ofctl_meter_mod__(argv[1], argv[2], OFPMC13_ADD); +} + +static void +ofctl_mod_meter(int argc OVS_UNUSED, char *argv[]) +{ + ofctl_meter_mod__(argv[1], argv[2], OFPMC13_MODIFY); +} + +static void +ofctl_del_meters(int argc, char *argv[]) +{ + ofctl_meter_mod__(argv[1], argc > 2 ? argv[2] : NULL, OFPMC13_DELETE); +} + +static void +ofctl_dump_meters(int argc, char *argv[]) +{ + ofctl_meter_request__(argv[1], argc > 2 ? argv[2] : NULL, + OFPUTIL_METER_CONFIG); +} + +static void +ofctl_meter_stats(int argc, char *argv[]) +{ + ofctl_meter_request__(argv[1], argc > 2 ? argv[2] : NULL, + OFPUTIL_METER_STATS); +} + +static void +ofctl_meter_features(int argc OVS_UNUSED, char *argv[]) +{ + ofctl_meter_request__(argv[1], NULL, OFPUTIL_METER_FEATURES); +} + /* Undocumented commands for unit testing. */ @@ -2603,15 +2766,15 @@ print_differences(const char *prefix, for (i = 0; i < MIN(a_len, b_len); i++) { if (a[i] != b[i]) { - printf("%s%2zu: %02"PRIx8" -> %02"PRIx8"\n", + printf("%s%2"PRIuSIZE": %02"PRIx8" -> %02"PRIx8"\n", prefix, i, a[i], b[i]); } } for (i = a_len; i < b_len; i++) { - printf("%s%2zu: (none) -> %02"PRIx8"\n", prefix, i, b[i]); + printf("%s%2"PRIuSIZE": (none) -> %02"PRIx8"\n", prefix, i, b[i]); } for (i = b_len; i < a_len; i++) { - printf("%s%2zu: %02"PRIx8" -> (none)\n", prefix, i, a[i]); + printf("%s%2"PRIuSIZE": %02"PRIx8" -> (none)\n", prefix, i, a[i]); } } @@ -2642,7 +2805,8 @@ ofctl_parse_ofp10_actions(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) /* Convert to ofpacts. */ ofpbuf_init(&ofpacts, 0); size = of10_in.size; - error = ofpacts_pull_openflow10(&of10_in, of10_in.size, &ofpacts); + error = ofpacts_pull_openflow_actions(&of10_in, of10_in.size, + OFP10_VERSION, &ofpacts); if (error) { printf("bad OF1.1 actions: %s\n\n", ofperr_get_name(error)); ofpbuf_uninit(&ofpacts); @@ -2653,13 +2817,15 @@ ofctl_parse_ofp10_actions(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) /* Print cls_rule. */ ds_init(&s); + ds_put_cstr(&s, "actions="); ofpacts_format(ofpacts.data, ofpacts.size, &s); puts(ds_cstr(&s)); ds_destroy(&s); /* Convert back to ofp10 actions and print differences from input. */ ofpbuf_init(&of10_out, 0); - ofpacts_put_openflow10(ofpacts.data, ofpacts.size, &of10_out); + ofpacts_put_openflow_actions(ofpacts.data, ofpacts.size, &of10_out, + OFP10_VERSION); print_differences("", of10_in.data, of10_in.size, of10_out.data, of10_out.size); @@ -2709,7 +2875,7 @@ ofctl_parse_ofp10_match(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) ovs_fatal(0, "Trailing garbage in hex data"); } if (match_expout.size != sizeof(struct ofp10_match)) { - ovs_fatal(0, "Input is %zu bytes, expected %zu", + ovs_fatal(0, "Input is %"PRIuSIZE" bytes, expected %"PRIuSIZE, match_expout.size, sizeof(struct ofp10_match)); } @@ -2724,7 +2890,7 @@ ofctl_parse_ofp10_match(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) ovs_fatal(0, "Trailing garbage in hex data"); } if (match_in.size != sizeof(struct ofp10_match)) { - ovs_fatal(0, "Input is %zu bytes, expected %zu", + ovs_fatal(0, "Input is %"PRIuSIZE" bytes, expected %"PRIuSIZE, match_in.size, sizeof(struct ofp10_match)); } @@ -2773,7 +2939,7 @@ ofctl_parse_ofp11_match(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) ovs_fatal(0, "Trailing garbage in hex data"); } if (match_in.size != sizeof(struct ofp11_match)) { - ovs_fatal(0, "Input is %zu bytes, expected %zu", + ovs_fatal(0, "Input is %"PRIuSIZE" bytes, expected %"PRIuSIZE, match_in.size, sizeof(struct ofp11_match)); } @@ -2827,8 +2993,8 @@ ofctl_parse_ofp11_actions(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) /* Convert to ofpacts. */ ofpbuf_init(&ofpacts, 0); size = of11_in.size; - error = ofpacts_pull_openflow11_actions(&of11_in, of11_in.size, - &ofpacts); + error = ofpacts_pull_openflow_actions(&of11_in, of11_in.size, + OFP11_VERSION, &ofpacts); if (error) { printf("bad OF1.1 actions: %s\n\n", ofperr_get_name(error)); ofpbuf_uninit(&ofpacts); @@ -2839,13 +3005,15 @@ ofctl_parse_ofp11_actions(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) /* Print cls_rule. */ ds_init(&s); + ds_put_cstr(&s, "actions="); ofpacts_format(ofpacts.data, ofpacts.size, &s); puts(ds_cstr(&s)); ds_destroy(&s); /* Convert back to ofp11 actions and print differences from input. */ ofpbuf_init(&of11_out, 0); - ofpacts_put_openflow11_actions(ofpacts.data, ofpacts.size, &of11_out); + ofpacts_put_openflow_actions(ofpacts.data, ofpacts.size, &of11_out, + OFP11_VERSION); print_differences("", of11_in.data, of11_in.size, of11_out.data, of11_out.size); @@ -2895,14 +3063,16 @@ ofctl_parse_ofp11_instructions(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) /* Convert to ofpacts. */ ofpbuf_init(&ofpacts, 0); size = of11_in.size; - error = ofpacts_pull_openflow11_instructions(&of11_in, of11_in.size, - &ofpacts); + error = ofpacts_pull_openflow_instructions(&of11_in, of11_in.size, + OFP11_VERSION, &ofpacts); if (!error) { - /* Verify actions. */ + /* Verify actions, enforce consistency. */ struct flow flow; memset(&flow, 0, sizeof flow); - error = ofpacts_check(ofpacts.data, ofpacts.size, &flow, OFPP_MAX, - table_id ? atoi(table_id) : 0); + error = ofpacts_check_consistency(ofpacts.data, ofpacts.size, + &flow, OFPP_MAX, + table_id ? atoi(table_id) : 0, + 255, OFPUTIL_P_OF11_STD); } if (error) { printf("bad OF1.1 instructions: %s\n\n", ofperr_get_name(error)); @@ -2914,6 +3084,7 @@ ofctl_parse_ofp11_instructions(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) /* Print cls_rule. */ ds_init(&s); + ds_put_cstr(&s, "actions="); ofpacts_format(ofpacts.data, ofpacts.size, &s); puts(ds_cstr(&s)); ds_destroy(&s); @@ -2921,8 +3092,8 @@ ofctl_parse_ofp11_instructions(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) /* Convert back to ofp11 instructions and print differences from * input. */ ofpbuf_init(&of11_out, 0); - ofpacts_put_openflow11_instructions(ofpacts.data, ofpacts.size, - &of11_out); + ofpacts_put_openflow_instructions(ofpacts.data, ofpacts.size, + &of11_out, OFP13_VERSION); print_differences("", of11_in.data, of11_in.size, of11_out.data, of11_out.size); @@ -2935,6 +3106,36 @@ ofctl_parse_ofp11_instructions(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) ds_destroy(&in); } +/* "parse-pcap PCAP": read packets from PCAP and print their flows. */ +static void +ofctl_parse_pcap(int argc OVS_UNUSED, char *argv[]) +{ + FILE *pcap; + + pcap = pcap_open(argv[1], "rb"); + if (!pcap) { + ovs_fatal(errno, "%s: open failed", argv[1]); + } + + for (;;) { + struct ofpbuf *packet; + struct flow flow; + int error; + + error = pcap_read(pcap, &packet); + if (error == EOF) { + break; + } else if (error) { + ovs_fatal(error, "%s: read failed", argv[1]); + } + + flow_extract(packet, 0, 0, NULL, NULL, &flow); + flow_print(stdout, &flow); + putchar('\n'); + ofpbuf_delete(packet); + } +} + /* "check-vlan VLAN_TCI VLAN_TCI_MASK": converts the specified vlan_tci and * mask values to and from various formats and prints the results. */ static void @@ -3142,16 +3343,26 @@ static const struct command all_commands[] = { { "dump-flows", 1, 2, ofctl_dump_flows }, { "dump-aggregate", 1, 2, ofctl_dump_aggregate }, { "queue-stats", 1, 3, ofctl_queue_stats }, + { "queue-get-config", 2, 2, ofctl_queue_get_config }, { "add-flow", 2, 2, ofctl_add_flow }, { "add-flows", 2, 2, ofctl_add_flows }, { "mod-flows", 2, 2, ofctl_mod_flows }, { "del-flows", 1, 2, ofctl_del_flows }, { "replace-flows", 2, 2, ofctl_replace_flows }, { "diff-flows", 2, 2, ofctl_diff_flows }, + { "add-meter", 2, 2, ofctl_add_meter }, + { "mod-meter", 2, 2, ofctl_mod_meter }, + { "del-meter", 2, 2, ofctl_del_meters }, + { "del-meters", 1, 1, ofctl_del_meters }, + { "dump-meter", 2, 2, ofctl_dump_meters }, + { "dump-meters", 1, 1, ofctl_dump_meters }, + { "meter-stats", 1, 2, ofctl_meter_stats }, + { "meter-features", 1, 1, ofctl_meter_features }, { "packet-out", 4, INT_MAX, ofctl_packet_out }, { "dump-ports", 1, 2, ofctl_dump_ports }, { "dump-ports-desc", 1, 1, ofctl_dump_ports_desc }, { "mod-port", 3, 3, ofctl_mod_port }, + { "mod-table", 3, 3, ofctl_mod_table }, { "get-frags", 1, 1, ofctl_get_frags }, { "set-frags", 2, 2, ofctl_set_frags }, { "ofp-parse", 1, 1, ofctl_ofp_parse }, @@ -3179,6 +3390,7 @@ static const struct command all_commands[] = { { "parse-ofp11-match", 0, 0, ofctl_parse_ofp11_match }, { "parse-ofp11-actions", 0, 0, ofctl_parse_ofp11_actions }, { "parse-ofp11-instructions", 0, 0, ofctl_parse_ofp11_instructions }, + { "parse-pcap", 1, 1, ofctl_parse_pcap }, { "check-vlan", 2, 2, ofctl_check_vlan }, { "print-error", 1, 1, ofctl_print_error }, { "encode-error-reply", 2, 2, ofctl_encode_error_reply },