X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=utilities%2Fovs-ofctl.c;h=b46fd7296e54533f6228563ebf3b2f340aadde77;hb=56085be5fed24dbc44e01b6c72adcafe2328846f;hp=5eb8cf4aee7be25860a16e54a6d48c1fe45edf78;hpb=34582733d9aad82bba60f4bf986b62d58412502a;p=cascardo%2Fovs.git diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c index 5eb8cf4ae..b46fd7296 100644 --- a/utilities/ovs-ofctl.c +++ b/utilities/ovs-ofctl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include @@ -36,6 +36,7 @@ #include "compiler.h" #include "dirs.h" #include "dynamic-string.h" +#include "fatal-signal.h" #include "nx-match.h" #include "odp-util.h" #include "ofp-actions.h" @@ -49,6 +50,7 @@ #include "ofproto/ofproto.h" #include "openflow/nicira-ext.h" #include "openflow/openflow.h" +#include "dp-packet.h" #include "packets.h" #include "pcap-file.h" #include "poll-loop.h" @@ -58,13 +60,19 @@ #include "timeval.h" #include "unixctl.h" #include "util.h" -#include "vconn.h" -#include "vlog.h" +#include "openvswitch/vconn.h" +#include "openvswitch/vlog.h" #include "meta-flow.h" #include "sort.h" VLOG_DEFINE_THIS_MODULE(ofctl); +/* --bundle: Use OpenFlow 1.4 bundle for making the flow table change atomic. + * NOTE: Also the flow mod will use OpenFlow 1.4, so the semantics may be + * different (see the comment in parse_options() for details). + */ +static bool bundle = false; + /* --strict: Use strict matching for flow mod commands? Additionally governs * use of nx_pull_match() instead of nx_pull_match_loose() in parse-nx-match. */ @@ -90,6 +98,10 @@ static int verbosity; * "snoop" command? */ static bool timestamp; +/* --unixctl-path: Path to use for unixctl server, for "monitor" and "snoop" + commands. */ +static char *unixctl_path; + /* --sort, --rsort: Sort order. */ enum sort_order { SORT_ASC, SORT_DESC }; struct sort_criterion { @@ -99,9 +111,9 @@ struct sort_criterion { static struct sort_criterion *criteria; static size_t n_criteria, allocated_criteria; -static const struct command *get_all_commands(void); +static const struct ovs_cmdl_command *get_all_commands(void); -static void usage(void) NO_RETURN; +OVS_NO_RETURN static void usage(void); static void parse_options(int argc, char *argv[]); static bool recv_flow_stats_reply(struct vconn *, ovs_be32 send_xid, @@ -111,10 +123,16 @@ static bool recv_flow_stats_reply(struct vconn *, ovs_be32 send_xid, int main(int argc, char *argv[]) { + struct ovs_cmdl_context ctx = { .argc = 0, }; set_program_name(argv[0]); + service_start(&argc, &argv); parse_options(argc, argv); - signal(SIGPIPE, SIG_IGN); - run_command(argc - optind, argv + optind, get_all_commands()); + fatal_ignore_sigpipe(); + ctx.argc = argc - optind; + ctx.argv = argv + optind; + + daemon_become_new_user(false); + ovs_cmdl_run_command(&ctx, get_all_commands()); return 0; } @@ -148,6 +166,8 @@ parse_options(int argc, char *argv[]) OPT_TIMESTAMP, OPT_SORT, OPT_RSORT, + OPT_UNIXCTL, + OPT_BUNDLE, DAEMON_OPTION_ENUMS, OFP_VERSION_OPTION_ENUMS, VLOG_OPTION_ENUMS @@ -162,17 +182,37 @@ parse_options(int argc, char *argv[]) {"timestamp", no_argument, NULL, OPT_TIMESTAMP}, {"sort", optional_argument, NULL, OPT_SORT}, {"rsort", optional_argument, NULL, OPT_RSORT}, + {"unixctl", required_argument, NULL, OPT_UNIXCTL}, {"help", no_argument, NULL, 'h'}, + {"option", no_argument, NULL, 'o'}, + {"bundle", no_argument, NULL, OPT_BUNDLE}, DAEMON_LONG_OPTIONS, OFP_VERSION_LONG_OPTIONS, VLOG_LONG_OPTIONS, STREAM_SSL_LONG_OPTIONS, {NULL, 0, NULL, 0}, }; - char *short_options = long_options_to_short_options(long_options); + char *short_options = ovs_cmdl_long_options_to_short_options(long_options); uint32_t versions; enum ofputil_protocol version_protocols; + /* For now, ovs-ofctl only enables OpenFlow 1.0 by default. This is + * because ovs-ofctl implements command such as "add-flow" as raw OpenFlow + * requests, but those requests have subtly different semantics in + * different OpenFlow versions. For example: + * + * - In OpenFlow 1.0, a "mod-flow" operation that does not find any + * existing flow to modify adds a new flow. + * + * - In OpenFlow 1.1, a "mod-flow" operation that does not find any + * existing flow to modify adds a new flow, but only if the mod-flow + * did not match on the flow cookie. + * + * - In OpenFlow 1.2 and a later, a "mod-flow" operation never adds a + * new flow. + */ + set_allowed_ofp_versions("OpenFlow10"); + for (;;) { unsigned long int timeout; int c; @@ -215,6 +255,14 @@ parse_options(int argc, char *argv[]) case 'h': usage(); + case 'o': + ovs_cmdl_print_options(long_options); + exit(EXIT_SUCCESS); + + case OPT_BUNDLE: + bundle = true; + break; + case OPT_STRICT: strict = true; break; @@ -235,6 +283,10 @@ parse_options(int argc, char *argv[]) add_sort_criterion(SORT_DESC, optarg); break; + case OPT_UNIXCTL: + unixctl_path = optarg; + break; + DAEMON_OPTION_HANDLERS OFP_VERSION_OPTION_HANDLERS VLOG_OPTION_HANDLERS @@ -255,6 +307,15 @@ parse_options(int argc, char *argv[]) free(short_options); + /* Implicit OpenFlow 1.4 with the '--bundle' option. */ + if (bundle) { + /* Add implicit allowance for OpenFlow 1.4. */ + add_allowed_ofp_versions(ofputil_protocols_to_version_bitmap( + OFPUTIL_P_OF14_OXM)); + /* Remove all prior versions. */ + mask_allowed_ofp_versions(ofputil_protocols_to_version_bitmap( + OFPUTIL_P_OF14_UP)); + } versions = get_allowed_ofp_versions(); version_protocols = ofputil_protocols_from_version_bitmap(versions); if (!(allowed_protocols & version_protocols)) { @@ -281,12 +342,17 @@ usage(void) " show SWITCH show OpenFlow information\n" " dump-desc SWITCH print switch description\n" " dump-tables SWITCH print table stats\n" + " dump-table-features SWITCH print table features\n" + " dump-table-desc SWITCH print table description (OF1.4+)\n" " mod-port SWITCH IFACE ACT modify port behavior\n" " mod-table SWITCH MOD modify flow table behavior\n" + " OF1.1/1.2 MOD: controller, continue, drop\n" + " OF1.4+ MOD: evict, noevict, vacancy:low,high, novacancy\n" " get-frags SWITCH print fragment handling behavior\n" " set-frags SWITCH FRAG_MODE set fragment handling behavior\n" + " FRAG_MODE: normal, drop, reassemble, nx-match\n" " dump-ports SWITCH [PORT] print port statistics\n" - " dump-ports-desc SWITCH print port descriptions\n" + " dump-ports-desc SWITCH [PORT] print port descriptions\n" " dump-flows SWITCH print all flow entries\n" " dump-flows SWITCH FLOW print matching FLOWs\n" " dump-aggregate SWITCH print aggregate flow statistics\n" @@ -304,13 +370,15 @@ usage(void) " print packets received from SWITCH\n" " snoop SWITCH snoop on SWITCH and its controller\n" " add-group SWITCH GROUP add group described by GROUP\n" - " add-group SWITCH FILE add group from FILE\n" + " add-groups SWITCH FILE add group from FILE\n" " mod-group SWITCH GROUP modify specific group\n" " del-groups SWITCH [GROUP] delete matching GROUPs\n" + " insert-buckets SWITCH [GROUP] add buckets to GROUP\n" + " remove-buckets SWITCH [GROUP] remove buckets from GROUP\n" " dump-group-features SWITCH print group features\n" - " dump-groups SWITCH print group description\n" + " dump-groups SWITCH [GROUP] print group description\n" " dump-group-stats SWITCH [GROUP] print group statistics\n" - " queue-get-config SWITCH PORT print queue information for port\n" + " queue-get-config SWITCH [PORT] print queue config 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" @@ -319,13 +387,17 @@ usage(void) " dump-meters SWITCH print all meter configuration\n" " meter-stats SWITCH [METER] print meter statistics\n" " meter-features SWITCH print meter features\n" + " add-tlv-map SWITCH MAP add TLV option MAPpings\n" + " del-tlv-map SWITCH [MAP] delete TLV option MAPpings\n" + " dump-tlv-map SWITCH print TLV option mappings\n" "\nFor OpenFlow switches and controllers:\n" " probe TARGET probe whether TARGET is up\n" " ping TARGET [N] latency of N-byte echos\n" " benchmark TARGET N COUNT bandwidth of COUNT N-byte echos\n" "SWITCH or TARGET is an active OpenFlow connection method.\n" "\nOther commands:\n" - " ofp-parse FILE print messages read from FILE\n", + " ofp-parse FILE print messages read from FILE\n" + " ofp-parse-pcap PCAP print OpenFlow read from PCAP\n", program_name, program_name); vconn_usage(true, false, false); daemon_usage(); @@ -341,6 +413,7 @@ usage(void) " -t, --timeout=SECS give up after SECS seconds\n" " --sort[=field] sort in ascending order\n" " --rsort[=field] sort in descending order\n" + " --unixctl=SOCKET set control socket name\n" " -h, --help display this help message\n" " -V, --version display version information\n"); exit(EXIT_SUCCESS); @@ -356,7 +429,7 @@ ofctl_exit(struct unixctl_conn *conn, int argc OVS_UNUSED, } static void run(int retval, const char *message, ...) - PRINTF_FORMAT(2, 3); + OVS_PRINTF_FORMAT(2, 3); static void run(int retval, const char *message, ...) @@ -453,7 +526,6 @@ open_vconn(const char *name, struct vconn **vconnp) static void send_openflow_buffer(struct vconn *vconn, struct ofpbuf *buffer) { - ofpmsg_update_length(buffer); run(vconn_send_block(vconn, buffer), "failed to send packet to switch"); } @@ -462,7 +534,6 @@ dump_transaction(struct vconn *vconn, struct ofpbuf *request) { struct ofpbuf *reply; - ofpmsg_update_length(request); run(vconn_transact(vconn, request, &reply), "talking to %s", vconn_get_name(vconn)); ofp_print(stdout, reply->data, reply->size, verbosity + 1); @@ -542,13 +613,9 @@ dump_trivial_stats_transaction(const char *vconn_name, enum ofpraw raw) * * Destroys all of the 'requests'. */ static void -transact_multiple_noreply(struct vconn *vconn, struct list *requests) +transact_multiple_noreply(struct vconn *vconn, struct ovs_list *requests) { - struct ofpbuf *request, *reply; - - LIST_FOR_EACH (request, list_node, requests) { - ofpmsg_update_length(request); - } + struct ofpbuf *reply; run(vconn_transact_multiple_noreply(vconn, requests, &reply), "talking to %s", vconn_get_name(vconn)); @@ -559,6 +626,20 @@ transact_multiple_noreply(struct vconn *vconn, struct list *requests) ofpbuf_delete(reply); } +static void +bundle_error_reporter(const struct ofp_header *oh) +{ + ofp_print(stderr, oh, ntohs(oh->length), verbosity + 1); + fflush(stderr); +} + +static void +bundle_transact(struct vconn *vconn, struct ovs_list *requests, uint16_t flags) +{ + run(vconn_bundle_transact(vconn, requests, flags, bundle_error_reporter), + "talking to %s", vconn_get_name(vconn)); +} + /* Sends 'request', which should be a request that only has a reply if an error * occurs, and waits for it to succeed or fail. If an error does occur, prints * it and exits with an error. @@ -567,7 +648,7 @@ transact_multiple_noreply(struct vconn *vconn, struct list *requests) static void transact_noreply(struct vconn *vconn, struct ofpbuf *request) { - struct list requests; + struct ovs_list requests; list_init(&requests); list_push_back(&requests, &request->list_node); @@ -609,115 +690,68 @@ set_switch_config(struct vconn *vconn, const struct ofp_switch_config *config) } static void -ofctl_show(int argc OVS_UNUSED, char *argv[]) +ofctl_show(struct ovs_cmdl_context *ctx) { - const char *vconn_name = argv[1]; + const char *vconn_name = ctx->argv[1]; + enum ofp_version version; struct vconn *vconn; struct ofpbuf *request; struct ofpbuf *reply; - bool trunc; + bool has_ports; open_vconn(vconn_name, &vconn); - request = ofpraw_alloc(OFPRAW_OFPT_FEATURES_REQUEST, - vconn_get_version(vconn), 0); + version = vconn_get_version(vconn); + request = ofpraw_alloc(OFPRAW_OFPT_FEATURES_REQUEST, version, 0); run(vconn_transact(vconn, request, &reply), "talking to %s", vconn_name); - trunc = ofputil_switch_features_ports_trunc(reply); + has_ports = ofputil_switch_features_has_ports(reply); ofp_print(stdout, reply->data, reply->size, verbosity + 1); - ofpbuf_delete(reply); - if (trunc) { - /* The Features Reply may not contain all the ports, so send a - * Port Description stats request, which doesn't have size - * constraints. */ - dump_trivial_stats_transaction(vconn_name, - OFPRAW_OFPST_PORT_DESC_REQUEST); + if (!has_ports) { + request = ofputil_encode_port_desc_stats_request(version, OFPP_ANY); + dump_stats_transaction(vconn, request); } dump_trivial_transaction(vconn_name, OFPRAW_OFPT_GET_CONFIG_REQUEST); vconn_close(vconn); } static void -ofctl_dump_desc(int argc OVS_UNUSED, char *argv[]) +ofctl_dump_desc(struct ovs_cmdl_context *ctx) { - dump_trivial_stats_transaction(argv[1], OFPRAW_OFPST_DESC_REQUEST); + dump_trivial_stats_transaction(ctx->argv[1], OFPRAW_OFPST_DESC_REQUEST); } static void -ofctl_dump_tables(int argc OVS_UNUSED, char *argv[]) +ofctl_dump_tables(struct ovs_cmdl_context *ctx) { - dump_trivial_stats_transaction(argv[1], OFPRAW_OFPST_TABLE_REQUEST); + dump_trivial_stats_transaction(ctx->argv[1], OFPRAW_OFPST_TABLE_REQUEST); } -static bool -fetch_port_by_features(const char *vconn_name, - const char *port_name, ofp_port_t port_no, - struct ofputil_phy_port *pp, bool *trunc) +static void +ofctl_dump_table_features(struct ovs_cmdl_context *ctx) { - struct ofputil_switch_features features; - const struct ofp_header *oh; - struct ofpbuf *request, *reply; + struct ofpbuf *request; struct vconn *vconn; - enum ofperr error; - enum ofptype type; - struct ofpbuf b; - bool found = false; - - /* Fetch the switch's ofp_switch_features. */ - open_vconn(vconn_name, &vconn); - request = ofpraw_alloc(OFPRAW_OFPT_FEATURES_REQUEST, - vconn_get_version(vconn), 0); - run(vconn_transact(vconn, request, &reply), "talking to %s", vconn_name); - vconn_close(vconn); - - oh = reply->data; - if (ofptype_decode(&type, reply->data) - || type != OFPTYPE_FEATURES_REPLY) { - ovs_fatal(0, "%s: received bad features reply", vconn_name); - } - - *trunc = false; - if (ofputil_switch_features_ports_trunc(reply)) { - *trunc = true; - goto exit; - } - error = ofputil_decode_switch_features(oh, &features, &b); - if (error) { - ovs_fatal(0, "%s: failed to decode features reply (%s)", - vconn_name, ofperr_to_string(error)); - } - - while (!ofputil_pull_phy_port(oh->version, &b, pp)) { - if (port_no != OFPP_NONE - ? port_no == pp->port_no - : !strcmp(pp->name, port_name)) { - found = true; - goto exit; - } - } + open_vconn(ctx->argv[1], &vconn); + request = ofputil_encode_table_features_request(vconn_get_version(vconn)); -exit: - ofpbuf_delete(reply); - return found; -} + /* The following is similar to dump_trivial_stats_transaction(), but it + * maintains the previous 'ofputil_table_features' from one stats reply + * message to the next, which allows duplication to be eliminated in the + * output across messages. Otherwise the output is much larger and harder + * to read, because only 17 or so ofputil_table_features elements fit in a + * single 64 kB OpenFlow message and therefore you get a ton of repetition + * (every 17th element is printed in full instead of abbreviated). */ -static bool -fetch_port_by_stats(const char *vconn_name, - const char *port_name, ofp_port_t port_no, - struct ofputil_phy_port *pp) -{ - struct ofpbuf *request; - struct vconn *vconn; - ovs_be32 send_xid; + const struct ofp_header *request_oh = request->data; + ovs_be32 send_xid = request_oh->xid; bool done = false; - bool found = false; - request = ofpraw_alloc(OFPRAW_OFPST_PORT_DESC_REQUEST, OFP10_VERSION, 0); - send_xid = ((struct ofp_header *) request->data)->xid; + struct ofputil_table_features prev; + int n = 0; - open_vconn(vconn_name, &vconn); send_openflow_buffer(vconn, request); while (!done) { ovs_be32 recv_xid; @@ -726,34 +760,42 @@ fetch_port_by_stats(const char *vconn_name, run(vconn_recv_block(vconn, &reply), "OpenFlow packet receive failed"); recv_xid = ((struct ofp_header *) reply->data)->xid; if (send_xid == recv_xid) { - struct ofp_header *oh = reply->data; enum ofptype type; - struct ofpbuf b; - uint16_t flags; - - ofpbuf_use_const(&b, oh, ntohs(oh->length)); - if (ofptype_pull(&type, &b) - || type != OFPTYPE_PORT_DESC_STATS_REPLY) { - ovs_fatal(0, "received bad reply: %s", - ofp_to_string(reply->data, reply->size, - verbosity + 1)); - } + enum ofperr error; + error = ofptype_decode(&type, reply->data); + if (error) { + ovs_fatal(0, "decode error: %s", ofperr_get_name(error)); + } else if (type == OFPTYPE_ERROR) { + ofp_print(stdout, reply->data, reply->size, verbosity + 1); + done = true; + } else if (type == OFPTYPE_TABLE_FEATURES_STATS_REPLY) { + done = !ofpmp_more(reply->data); + for (;;) { + struct ofputil_table_features tf; + int retval; - flags = ofpmp_flags(oh); - done = !(flags & OFPSF_REPLY_MORE); + retval = ofputil_decode_table_features(reply, &tf, true); + if (retval) { + if (retval != EOF) { + ovs_fatal(0, "decode error: %s", + ofperr_get_name(retval)); + } + break; + } - if (found) { - /* We've already found the port, but we need to drain - * the queue of any other replies for this request. */ - continue; - } + struct ds s = DS_EMPTY_INITIALIZER; + ofp_print_table_features(&s, &tf, n ? &prev : NULL, + NULL, NULL); + puts(ds_cstr(&s)); + ds_destroy(&s); - while (!ofputil_pull_phy_port(oh->version, &b, pp)) { - if (port_no != OFPP_NONE ? port_no == pp->port_no - : !strcmp(pp->name, port_name)) { - found = true; - break; + prev = tf; + n++; } + } else { + ovs_fatal(0, "received bad reply: %s", + ofp_to_string(reply->data, reply->size, + verbosity + 1)); } } else { VLOG_DBG("received reply with xid %08"PRIx32" " @@ -761,11 +803,26 @@ fetch_port_by_stats(const char *vconn_name, } ofpbuf_delete(reply); } + vconn_close(vconn); +} + +static void +ofctl_dump_table_desc(struct ovs_cmdl_context *ctx) +{ + struct ofpbuf *request; + struct vconn *vconn; + + open_vconn(ctx->argv[1], &vconn); + request = ofputil_encode_table_desc_request(vconn_get_version(vconn)); + if (request) { + dump_stats_transaction(vconn, request); + } - return found; + vconn_close(vconn); } + static bool str_to_ofp(const char *s, ofp_port_t *ofp_port) { @@ -777,6 +834,142 @@ str_to_ofp(const char *s, ofp_port_t *ofp_port) return ret; } +struct port_iterator { + struct vconn *vconn; + + enum { PI_FEATURES, PI_PORT_DESC } variant; + struct ofpbuf *reply; + ovs_be32 send_xid; + bool more; +}; + +static void +port_iterator_fetch_port_desc(struct port_iterator *pi) +{ + pi->variant = PI_PORT_DESC; + pi->more = true; + + struct ofpbuf *rq = ofputil_encode_port_desc_stats_request( + vconn_get_version(pi->vconn), OFPP_ANY); + pi->send_xid = ((struct ofp_header *) rq->data)->xid; + send_openflow_buffer(pi->vconn, rq); +} + +static void +port_iterator_fetch_features(struct port_iterator *pi) +{ + pi->variant = PI_FEATURES; + + /* Fetch the switch's ofp_switch_features. */ + enum ofp_version version = vconn_get_version(pi->vconn); + struct ofpbuf *rq = ofpraw_alloc(OFPRAW_OFPT_FEATURES_REQUEST, version, 0); + run(vconn_transact(pi->vconn, rq, &pi->reply), + "talking to %s", vconn_get_name(pi->vconn)); + + const struct ofp_header *oh = pi->reply->data; + enum ofptype type; + if (ofptype_decode(&type, pi->reply->data) + || type != OFPTYPE_FEATURES_REPLY) { + ovs_fatal(0, "%s: received bad features reply", + vconn_get_name(pi->vconn)); + } + if (!ofputil_switch_features_has_ports(pi->reply)) { + /* The switch features reply does not contain a complete list of ports. + * Probably, there are more ports than will fit into a single 64 kB + * OpenFlow message. Use OFPST_PORT_DESC to get a complete list of + * ports. */ + ofpbuf_delete(pi->reply); + pi->reply = NULL; + port_iterator_fetch_port_desc(pi); + return; + } + + struct ofputil_switch_features features; + enum ofperr error = ofputil_decode_switch_features(oh, &features, + pi->reply); + if (error) { + ovs_fatal(0, "%s: failed to decode features reply (%s)", + vconn_get_name(pi->vconn), ofperr_to_string(error)); + } +} + +/* Initializes 'pi' to prepare for iterating through all of the ports on the + * OpenFlow switch to which 'vconn' is connected. + * + * During iteration, the client should not make other use of 'vconn', because + * that can cause other messages to be interleaved with the replies used by the + * iterator and thus some ports may be missed or a hang can occur. */ +static void +port_iterator_init(struct port_iterator *pi, struct vconn *vconn) +{ + memset(pi, 0, sizeof *pi); + pi->vconn = vconn; + if (vconn_get_version(vconn) < OFP13_VERSION) { + port_iterator_fetch_features(pi); + } else { + port_iterator_fetch_port_desc(pi); + } +} + +/* Obtains the next port from 'pi'. On success, initializes '*pp' with the + * port's details and returns true, otherwise (if all the ports have already + * been seen), returns false. */ +static bool +port_iterator_next(struct port_iterator *pi, struct ofputil_phy_port *pp) +{ + for (;;) { + if (pi->reply) { + int retval = ofputil_pull_phy_port(vconn_get_version(pi->vconn), + pi->reply, pp); + if (!retval) { + return true; + } else if (retval != EOF) { + ovs_fatal(0, "received bad reply: %s", + ofp_to_string(pi->reply->data, pi->reply->size, + verbosity + 1)); + } + } + + if (pi->variant == PI_FEATURES || !pi->more) { + return false; + } + + ovs_be32 recv_xid; + do { + ofpbuf_delete(pi->reply); + run(vconn_recv_block(pi->vconn, &pi->reply), + "OpenFlow receive failed"); + recv_xid = ((struct ofp_header *) pi->reply->data)->xid; + } while (pi->send_xid != recv_xid); + + struct ofp_header *oh = pi->reply->data; + enum ofptype type; + if (ofptype_pull(&type, pi->reply) + || type != OFPTYPE_PORT_DESC_STATS_REPLY) { + ovs_fatal(0, "received bad reply: %s", + ofp_to_string(pi->reply->data, pi->reply->size, + verbosity + 1)); + } + + pi->more = (ofpmp_flags(oh) & OFPSF_REPLY_MORE) != 0; + } +} + +/* Destroys iterator 'pi'. */ +static void +port_iterator_destroy(struct port_iterator *pi) +{ + if (pi) { + while (pi->variant == PI_PORT_DESC && pi->more) { + /* Drain vconn's queue of any other replies for this request. */ + struct ofputil_phy_port pp; + port_iterator_next(pi, &pp); + } + + ofpbuf_delete(pi->reply); + } +} + /* Opens a connection to 'vconn_name', fetches the port structure for * 'port_name' (which may be a port name or number), and copies it into * '*pp'. */ @@ -784,23 +977,30 @@ static void fetch_ofputil_phy_port(const char *vconn_name, const char *port_name, struct ofputil_phy_port *pp) { + struct vconn *vconn; ofp_port_t port_no; - bool found; - bool trunc; + bool found = false; /* Try to interpret the argument as a port number. */ if (!str_to_ofp(port_name, &port_no)) { port_no = OFPP_NONE; } - /* Try to find the port based on the Features Reply. If it looks - * like the results may be truncated, then use the Port Description - * stats message introduced in OVS 1.7. */ - found = fetch_port_by_features(vconn_name, port_name, port_no, pp, - &trunc); - if (trunc) { - found = fetch_port_by_stats(vconn_name, port_name, port_no, pp); + /* OpenFlow 1.0, 1.1, and 1.2 put the list of ports in the + * OFPT_FEATURES_REPLY message. OpenFlow 1.3 and later versions put it + * into the OFPST_PORT_DESC reply. Try it the correct way. */ + open_vconn(vconn_name, &vconn); + struct port_iterator pi; + for (port_iterator_init(&pi, vconn); port_iterator_next(&pi, pp); ) { + if (port_no != OFPP_NONE + ? port_no == pp->port_no + : !strcmp(pp->name, port_name)) { + found = true; + break; + } } + port_iterator_destroy(&pi); + vconn_close(vconn); if (!found) { ovs_fatal(0, "%s: couldn't find port `%s'", vconn_name, port_name); @@ -926,8 +1126,8 @@ compare_flows(const void *afs_, const void *bfs_) int ret; if (!f) { - unsigned int a_pri = afs->priority; - unsigned int b_pri = bfs->priority; + int a_pri = afs->priority; + int b_pri = bfs->priority; ret = a_pri < b_pri ? -1 : a_pri > b_pri; } else { bool ina, inb; @@ -957,10 +1157,11 @@ compare_flows(const void *afs_, const void *bfs_) } static void -ofctl_dump_flows(int argc, char *argv[]) +ofctl_dump_flows(struct ovs_cmdl_context *ctx) { if (!n_criteria) { - return ofctl_dump_flows__(argc, argv, false); + ofctl_dump_flows__(ctx->argc, ctx->argv, false); + return; } else { struct ofputil_flow_stats *fses; size_t n_fses, allocated_fses; @@ -972,7 +1173,7 @@ ofctl_dump_flows(int argc, char *argv[]) struct ds s; size_t i; - vconn = prepare_dump_flows(argc, argv, false, &request); + vconn = prepare_dump_flows(ctx->argc, ctx->argv, false, &request); send_xid = ((struct ofp_header *) request->data)->xid; send_openflow_buffer(vconn, request); @@ -1008,7 +1209,7 @@ ofctl_dump_flows(int argc, char *argv[]) ds_destroy(&s); for (i = 0; i < n_fses; i++) { - free(fses[i].ofpacts); + free(CONST_CAST(struct ofpact *, fses[i].ofpacts)); } free(fses); @@ -1017,27 +1218,27 @@ ofctl_dump_flows(int argc, char *argv[]) } static void -ofctl_dump_aggregate(int argc, char *argv[]) +ofctl_dump_aggregate(struct ovs_cmdl_context *ctx) { - return ofctl_dump_flows__(argc, argv, true); + ofctl_dump_flows__(ctx->argc, ctx->argv, true); } static void -ofctl_queue_stats(int argc, char *argv[]) +ofctl_queue_stats(struct ovs_cmdl_context *ctx) { struct ofpbuf *request; struct vconn *vconn; struct ofputil_queue_stats_request oqs; - open_vconn(argv[1], &vconn); + open_vconn(ctx->argv[1], &vconn); - if (argc > 2 && argv[2][0] && strcasecmp(argv[2], "all")) { - oqs.port_no = str_to_port_no(argv[1], argv[2]); + if (ctx->argc > 2 && ctx->argv[2][0] && strcasecmp(ctx->argv[2], "all")) { + oqs.port_no = str_to_port_no(ctx->argv[1], ctx->argv[2]); } else { oqs.port_no = OFPP_ANY; } - if (argc > 3 && argv[3][0] && strcasecmp(argv[3], "all")) { - oqs.queue_id = atoi(argv[3]); + if (ctx->argc > 3 && ctx->argv[3][0] && strcasecmp(ctx->argv[3], "all")) { + oqs.queue_id = atoi(ctx->argv[3]); } else { oqs.queue_id = OFPQ_ALL; } @@ -1048,22 +1249,43 @@ ofctl_queue_stats(int argc, char *argv[]) } static void -ofctl_queue_get_config(int argc OVS_UNUSED, char *argv[]) +ofctl_queue_get_config(struct ovs_cmdl_context *ctx) { - 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; + const char *vconn_name = ctx->argv[1]; + const char *port_name = ctx->argc >= 3 ? ctx->argv[2] : NULL; + ofp_port_t port = (port_name + ? str_to_port_no(vconn_name, port_name) + : OFPP_ANY); - 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); + struct vconn *vconn; + enum ofputil_protocol protocol = open_vconn(vconn_name, &vconn); + enum ofp_version version = ofputil_protocol_to_ofp_version(protocol); + if (port == OFPP_ANY && version == OFP10_VERSION) { + /* The user requested all queues on all ports. OpenFlow 1.0 only + * supports getting queues for an individual port, so to implement the + * user's request we have to get a list of all the ports. + * + * We use a second vconn to avoid having to accumulate a list of all of + * the ports. */ + struct vconn *vconn2; + enum ofputil_protocol protocol2 = open_vconn(vconn_name, &vconn2); + enum ofp_version version2 = ofputil_protocol_to_ofp_version(protocol2); + + struct port_iterator pi; + struct ofputil_phy_port pp; + for (port_iterator_init(&pi, vconn); port_iterator_next(&pi, &pp); ) { + if (ofp_to_u16(pp.port_no) < ofp_to_u16(OFPP_MAX)) { + dump_transaction(vconn2, + ofputil_encode_queue_get_config_request( + version2, pp.port_no)); + } + } + port_iterator_destroy(&pi); + vconn_close(vconn2); + } else { + dump_transaction(vconn, ofputil_encode_queue_get_config_request( + version, port)); + } vconn_close(vconn); } @@ -1104,6 +1326,34 @@ open_vconn_for_flow_mod(const char *remote, struct vconn **vconnp, "formats (%s)", usable_s); } +static void +bundle_flow_mod__(const char *remote, struct ofputil_flow_mod *fms, + size_t n_fms, enum ofputil_protocol usable_protocols) +{ + enum ofputil_protocol protocol; + struct vconn *vconn; + struct ovs_list requests; + size_t i; + + list_init(&requests); + + /* Bundles need OpenFlow 1.4+. */ + usable_protocols &= OFPUTIL_P_OF14_UP; + protocol = open_vconn_for_flow_mod(remote, &vconn, usable_protocols); + + for (i = 0; i < n_fms; i++) { + struct ofputil_flow_mod *fm = &fms[i]; + struct ofpbuf *request = ofputil_encode_flow_mod(fm, protocol); + + list_push_back(&requests, &request->list_node); + free(CONST_CAST(struct ofpact *, fm->ofpacts)); + } + + bundle_transact(vconn, &requests, OFPBF_ORDERED | OFPBF_ATOMIC); + ofpbuf_list_delete(&requests); + vconn_close(vconn); +} + static void ofctl_flow_mod__(const char *remote, struct ofputil_flow_mod *fms, size_t n_fms, enum ofputil_protocol usable_protocols) @@ -1112,25 +1362,36 @@ ofctl_flow_mod__(const char *remote, struct ofputil_flow_mod *fms, struct vconn *vconn; size_t i; + if (bundle) { + bundle_flow_mod__(remote, fms, n_fms, usable_protocols); + return; + } + protocol = open_vconn_for_flow_mod(remote, &vconn, usable_protocols); for (i = 0; i < n_fms; i++) { struct ofputil_flow_mod *fm = &fms[i]; transact_noreply(vconn, ofputil_encode_flow_mod(fm, protocol)); - free(fm->ofpacts); + free(CONST_CAST(struct ofpact *, fm->ofpacts)); } vconn_close(vconn); } static void -ofctl_flow_mod_file(int argc OVS_UNUSED, char *argv[], uint16_t command) +ofctl_flow_mod_file(int argc OVS_UNUSED, char *argv[], int command) { enum ofputil_protocol usable_protocols; struct ofputil_flow_mod *fms = NULL; size_t n_fms = 0; char *error; + if (command == OFPFC_ADD) { + /* Allow the file to specify a mix of commands. If none specified at + * the beginning of any given line, then the default is OFPFC_ADD, so + * this is backwards compatible. */ + command = -2; + } error = parse_ofp_flow_mod_file(argv[2], command, &fms, &n_fms, &usable_protocols); if (error) { @@ -1160,27 +1421,27 @@ ofctl_flow_mod(int argc, char *argv[], uint16_t command) } static void -ofctl_add_flow(int argc, char *argv[]) +ofctl_add_flow(struct ovs_cmdl_context *ctx) { - ofctl_flow_mod(argc, argv, OFPFC_ADD); + ofctl_flow_mod(ctx->argc, ctx->argv, OFPFC_ADD); } static void -ofctl_add_flows(int argc, char *argv[]) +ofctl_add_flows(struct ovs_cmdl_context *ctx) { - ofctl_flow_mod_file(argc, argv, OFPFC_ADD); + ofctl_flow_mod_file(ctx->argc, ctx->argv, OFPFC_ADD); } static void -ofctl_mod_flows(int argc, char *argv[]) +ofctl_mod_flows(struct ovs_cmdl_context *ctx) { - ofctl_flow_mod(argc, argv, strict ? OFPFC_MODIFY_STRICT : OFPFC_MODIFY); + ofctl_flow_mod(ctx->argc, ctx->argv, strict ? OFPFC_MODIFY_STRICT : OFPFC_MODIFY); } static void -ofctl_del_flows(int argc, char *argv[]) +ofctl_del_flows(struct ovs_cmdl_context *ctx) { - ofctl_flow_mod(argc, argv, strict ? OFPFC_DELETE_STRICT : OFPFC_DELETE); + ofctl_flow_mod(ctx->argc, ctx->argv, strict ? OFPFC_DELETE_STRICT : OFPFC_DELETE); } static void @@ -1390,8 +1651,8 @@ monitor_vconn(struct vconn *vconn, bool reply_to_echo_requests) int error; daemon_save_fd(STDERR_FILENO); - daemonize_start(); - error = unixctl_server_create(NULL, &server); + daemonize_start(false); + error = unixctl_server_create(unixctl_path, &server); if (error) { ovs_fatal(error, "failed to create unixctl server"); } @@ -1433,6 +1694,7 @@ monitor_vconn(struct vconn *vconn, bool reply_to_echo_requests) ofptype_decode(&type, b->data); ofp_print(stderr, b->data, b->size, verbosity + 2); + fflush(stderr); switch ((int) type) { case OFPTYPE_BARRIER_REPLY: @@ -1474,15 +1736,15 @@ monitor_vconn(struct vconn *vconn, bool reply_to_echo_requests) } static void -ofctl_monitor(int argc, char *argv[]) +ofctl_monitor(struct ovs_cmdl_context *ctx) { struct vconn *vconn; int i; enum ofputil_protocol usable_protocols; - open_vconn(argv[1], &vconn); - for (i = 2; i < argc; i++) { - const char *arg = argv[i]; + open_vconn(ctx->argv[1], &vconn); + for (i = 2; i < ctx->argc; i++) { + const char *arg = ctx->argv[i]; if (isdigit((unsigned char) *arg)) { struct ofp_switch_config config; @@ -1506,6 +1768,7 @@ ofctl_monitor(int argc, char *argv[]) msg = ofpbuf_new(0); ofputil_append_flow_monitor_request(&fmr, msg); dump_stats_transaction(vconn, msg); + fflush(stdout); } else { ovs_fatal(0, "%s: unsupported \"monitor\" argument", arg); } @@ -1537,9 +1800,11 @@ ofctl_monitor(int argc, char *argv[]) case OFP11_VERSION: case OFP12_VERSION: case OFP13_VERSION: + case OFP14_VERSION: + case OFP15_VERSION: break; default: - NOT_REACHED(); + OVS_NOT_REACHED(); } } @@ -1547,44 +1812,53 @@ ofctl_monitor(int argc, char *argv[]) } static void -ofctl_snoop(int argc OVS_UNUSED, char *argv[]) +ofctl_snoop(struct ovs_cmdl_context *ctx) { struct vconn *vconn; - open_vconn__(argv[1], SNOOP, &vconn); + open_vconn__(ctx->argv[1], SNOOP, &vconn); monitor_vconn(vconn, false); } static void -ofctl_dump_ports(int argc, char *argv[]) +ofctl_dump_ports(struct ovs_cmdl_context *ctx) { struct ofpbuf *request; struct vconn *vconn; ofp_port_t port; - open_vconn(argv[1], &vconn); - port = argc > 2 ? str_to_port_no(argv[1], argv[2]) : OFPP_ANY; + open_vconn(ctx->argv[1], &vconn); + port = ctx->argc > 2 ? str_to_port_no(ctx->argv[1], ctx->argv[2]) : OFPP_ANY; request = ofputil_encode_dump_ports_request(vconn_get_version(vconn), port); dump_stats_transaction(vconn, request); vconn_close(vconn); } static void -ofctl_dump_ports_desc(int argc OVS_UNUSED, char *argv[]) +ofctl_dump_ports_desc(struct ovs_cmdl_context *ctx) { - dump_trivial_stats_transaction(argv[1], OFPRAW_OFPST_PORT_DESC_REQUEST); + struct ofpbuf *request; + struct vconn *vconn; + ofp_port_t port; + + open_vconn(ctx->argv[1], &vconn); + port = ctx->argc > 2 ? str_to_port_no(ctx->argv[1], ctx->argv[2]) : OFPP_ANY; + request = ofputil_encode_port_desc_stats_request(vconn_get_version(vconn), + port); + dump_stats_transaction(vconn, request); + vconn_close(vconn); } static void -ofctl_probe(int argc OVS_UNUSED, char *argv[]) +ofctl_probe(struct ovs_cmdl_context *ctx) { struct ofpbuf *request; struct vconn *vconn; struct ofpbuf *reply; - open_vconn(argv[1], &vconn); + open_vconn(ctx->argv[1], &vconn); request = make_echo_request(vconn_get_version(vconn)); - run(vconn_transact(vconn, request, &reply), "talking to %s", argv[1]); + run(vconn_transact(vconn, request, &reply), "talking to %s", ctx->argv[1]); if (reply->size != sizeof(struct ofp_header)) { ovs_fatal(0, "reply does not match request"); } @@ -1593,7 +1867,7 @@ ofctl_probe(int argc OVS_UNUSED, char *argv[]) } static void -ofctl_packet_out(int argc, char *argv[]) +ofctl_packet_out(struct ovs_cmdl_context *ctx) { enum ofputil_protocol protocol; struct ofputil_packet_out po; @@ -1601,41 +1875,42 @@ ofctl_packet_out(int argc, char *argv[]) struct vconn *vconn; char *error; int i; - enum ofputil_protocol usable_protocols; /* TODO: Use in proto selection */ + enum ofputil_protocol usable_protocols; /* XXX: Use in proto selection */ ofpbuf_init(&ofpacts, 64); - error = parse_ofpacts(argv[3], &ofpacts, &usable_protocols); + error = ofpacts_parse_actions(ctx->argv[3], &ofpacts, &usable_protocols); if (error) { ovs_fatal(0, "%s", error); } po.buffer_id = UINT32_MAX; - po.in_port = str_to_port_no(argv[1], argv[2]); + po.in_port = str_to_port_no(ctx->argv[1], ctx->argv[2]); po.ofpacts = ofpacts.data; po.ofpacts_len = ofpacts.size; - protocol = open_vconn(argv[1], &vconn); - for (i = 4; i < argc; i++) { - struct ofpbuf *packet, *opo; + protocol = open_vconn(ctx->argv[1], &vconn); + for (i = 4; i < ctx->argc; i++) { + struct dp_packet *packet; + struct ofpbuf *opo; const char *error_msg; - error_msg = eth_from_hex(argv[i], &packet); + error_msg = eth_from_hex(ctx->argv[i], &packet); if (error_msg) { ovs_fatal(0, "%s", error_msg); } - po.packet = packet->data; - po.packet_len = packet->size; + po.packet = dp_packet_data(packet); + po.packet_len = dp_packet_size(packet); opo = ofputil_encode_packet_out(&po, protocol); transact_noreply(vconn, opo); - ofpbuf_delete(packet); + dp_packet_delete(packet); } vconn_close(vconn); ofpbuf_uninit(&ofpacts); } static void -ofctl_mod_port(int argc OVS_UNUSED, char *argv[]) +ofctl_mod_port(struct ovs_cmdl_context *ctx) { struct ofp_config_flag { const char *name; /* The flag's name. */ @@ -1661,22 +1936,22 @@ ofctl_mod_port(int argc OVS_UNUSED, char *argv[]) const char *command; bool not; - fetch_ofputil_phy_port(argv[1], argv[2], &pp); + fetch_ofputil_phy_port(ctx->argv[1], ctx->argv[2], &pp); pm.port_no = pp.port_no; - memcpy(pm.hw_addr, pp.hw_addr, ETH_ADDR_LEN); + pm.hw_addr = pp.hw_addr; pm.config = 0; pm.mask = 0; pm.advertise = 0; - if (!strncasecmp(argv[3], "no-", 3)) { - command = argv[3] + 3; + if (!strncasecmp(ctx->argv[3], "no-", 3)) { + command = ctx->argv[3] + 3; not = true; - } else if (!strncasecmp(argv[3], "no", 2)) { - command = argv[3] + 2; + } else if (!strncasecmp(ctx->argv[3], "no", 2)) { + command = ctx->argv[3] + 2; not = true; } else { - command = argv[3]; + command = ctx->argv[3]; not = false; } for (flag = flags; flag < &flags[ARRAY_SIZE(flags)]; flag++) { @@ -1686,75 +1961,154 @@ ofctl_mod_port(int argc OVS_UNUSED, char *argv[]) goto found; } } - ovs_fatal(0, "unknown mod-port command '%s'", argv[3]); + ovs_fatal(0, "unknown mod-port command '%s'", ctx->argv[3]); found: - protocol = open_vconn(argv[1], &vconn); + protocol = open_vconn(ctx->argv[1], &vconn); transact_noreply(vconn, ofputil_encode_port_mod(&pm, protocol)); vconn_close(vconn); } +/* This function uses OFPMP14_TABLE_DESC request to get the current + * table configuration from switch. The function then modifies + * only that table-config property, which has been requested. */ static void -ofctl_mod_table(int argc OVS_UNUSED, char *argv[]) +fetch_table_desc(struct vconn *vconn, struct ofputil_table_mod *tm, + struct ofputil_table_desc *td) { - 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); - } + struct ofpbuf *request; + ovs_be32 send_xid; + bool done = false; + bool found = false; - 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; - } - } - } + request = ofputil_encode_table_desc_request(vconn_get_version(vconn)); + send_xid = ((struct ofp_header *) request->data)->xid; + send_openflow_buffer(vconn, request); + while (!done) { + ovs_be32 recv_xid; + struct ofpbuf *reply; - 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); - } + run(vconn_recv_block(vconn, &reply), "OpenFlow packet receive failed"); + recv_xid = ((struct ofp_header *) reply->data)->xid; + if (send_xid == recv_xid) { + struct ofp_header *oh = reply->data; + enum ofptype type; + struct ofpbuf b; + uint16_t flags; - transact_noreply(vconn, ofputil_encode_table_mod(&tm, protocol)); - vconn_close(vconn); + ofpbuf_use_const(&b, oh, ntohs(oh->length)); + if (ofptype_pull(&type, &b) + || type != OFPTYPE_TABLE_DESC_REPLY) { + ovs_fatal(0, "received bad reply: %s", + ofp_to_string(reply->data, reply->size, + verbosity + 1)); + } + flags = ofpmp_flags(oh); + done = !(flags & OFPSF_REPLY_MORE); + if (found) { + /* We've already found the table desc consisting of current + * table configuration, but we need to drain the queue of + * any other replies for this request. */ + continue; + } + while (!ofputil_decode_table_desc(&b, td, oh->version)) { + if (td->table_id == tm->table_id) { + found = true; + break; + } + } + } else { + VLOG_DBG("received reply with xid %08"PRIx32" " + "!= expected %08"PRIx32, recv_xid, send_xid); + } + ofpbuf_delete(reply); + } + if (tm->eviction != OFPUTIL_TABLE_EVICTION_DEFAULT) { + tm->vacancy = td->vacancy; + tm->table_vacancy.vacancy_down = td->table_vacancy.vacancy_down; + tm->table_vacancy.vacancy_up = td->table_vacancy.vacancy_up; + } else if (tm->vacancy != OFPUTIL_TABLE_VACANCY_DEFAULT) { + tm->eviction = td->eviction; + tm->eviction_flags = td->eviction_flags; + } +} + +static void +ofctl_mod_table(struct ovs_cmdl_context *ctx) +{ + uint32_t usable_versions; + struct ofputil_table_mod tm; + struct vconn *vconn; + char *error; + int i; + + error = parse_ofp_table_mod(&tm, ctx->argv[2], ctx->argv[3], + &usable_versions); + if (error) { + ovs_fatal(0, "%s", error); + } + + uint32_t allowed_versions = get_allowed_ofp_versions(); + if (!(allowed_versions & usable_versions)) { + struct ds versions = DS_EMPTY_INITIALIZER; + ofputil_format_version_bitmap_names(&versions, usable_versions); + ovs_fatal(0, "table_mod '%s' requires one of the OpenFlow " + "versions %s", + ctx->argv[3], ds_cstr(&versions)); + } + mask_allowed_ofp_versions(usable_versions); + enum ofputil_protocol protocol = open_vconn(ctx->argv[1], &vconn); + + /* For OpenFlow 1.4+, ovs-ofctl mod-table should not affect table-config + * properties that the user didn't ask to change, so it is necessary to + * restore the current configuration of table-config parameters using + * OFPMP14_TABLE_DESC request. */ + if ((allowed_versions & (1u << OFP14_VERSION)) || + (allowed_versions & (1u << OFP15_VERSION))) { + struct ofputil_table_desc td; + + if (tm.table_id == OFPTT_ALL) { + for (i = 0; i < OFPTT_MAX; i++) { + tm.table_id = i; + fetch_table_desc(vconn, &tm, &td); + transact_noreply(vconn, + ofputil_encode_table_mod(&tm, protocol)); + } + } else { + fetch_table_desc(vconn, &tm, &td); + transact_noreply(vconn, ofputil_encode_table_mod(&tm, protocol)); + } + } else { + transact_noreply(vconn, ofputil_encode_table_mod(&tm, protocol)); + } + vconn_close(vconn); } static void -ofctl_get_frags(int argc OVS_UNUSED, char *argv[]) +ofctl_get_frags(struct ovs_cmdl_context *ctx) { struct ofp_switch_config config; struct vconn *vconn; - open_vconn(argv[1], &vconn); + open_vconn(ctx->argv[1], &vconn); fetch_switch_config(vconn, &config); puts(ofputil_frag_handling_to_string(ntohs(config.flags))); vconn_close(vconn); } static void -ofctl_set_frags(int argc OVS_UNUSED, char *argv[]) +ofctl_set_frags(struct ovs_cmdl_context *ctx) { struct ofp_switch_config config; enum ofp_config_flags mode; struct vconn *vconn; ovs_be16 flags; - if (!ofputil_frag_handling_from_string(argv[2], &mode)) { - ovs_fatal(0, "%s: unknown fragment handling mode", argv[2]); + if (!ofputil_frag_handling_from_string(ctx->argv[2], &mode)) { + ovs_fatal(0, "%s: unknown fragment handling mode", ctx->argv[2]); } - open_vconn(argv[1], &vconn); + open_vconn(ctx->argv[1], &vconn); fetch_switch_config(vconn, &config); flags = htons(mode) | (config.flags & htons(~OFPC_FRAG_MASK)); if (flags != config.flags) { @@ -1769,16 +2123,16 @@ ofctl_set_frags(int argc OVS_UNUSED, char *argv[]) if (flags != config.flags) { ovs_fatal(0, "%s: setting fragment handling mode failed (this " "switch probably doesn't support mode \"%s\")", - argv[1], ofputil_frag_handling_to_string(mode)); + ctx->argv[1], ofputil_frag_handling_to_string(mode)); } } vconn_close(vconn); } static void -ofctl_ofp_parse(int argc OVS_UNUSED, char *argv[]) +ofctl_ofp_parse(struct ovs_cmdl_context *ctx) { - const char *filename = argv[1]; + const char *filename = ctx->argv[1]; struct ofpbuf b; FILE *file; @@ -1825,20 +2179,108 @@ ofctl_ofp_parse(int argc OVS_UNUSED, char *argv[]) } } +static bool +is_openflow_port(ovs_be16 port_, char *ports[]) +{ + uint16_t port = ntohs(port_); + if (ports[0]) { + int i; + + for (i = 0; ports[i]; i++) { + if (port == atoi(ports[i])) { + return true; + } + } + return false; + } else { + return port == OFP_PORT || port == OFP_OLD_PORT; + } +} + +static void +ofctl_ofp_parse_pcap(struct ovs_cmdl_context *ctx) +{ + struct tcp_reader *reader; + FILE *file; + int error; + bool first; + + file = ovs_pcap_open(ctx->argv[1], "rb"); + if (!file) { + ovs_fatal(errno, "%s: open failed", ctx->argv[1]); + } + + reader = tcp_reader_open(); + first = true; + for (;;) { + struct dp_packet *packet; + long long int when; + struct flow flow; + + error = ovs_pcap_read(file, &packet, &when); + if (error) { + break; + } + pkt_metadata_init(&packet->md, ODPP_NONE); + flow_extract(packet, &flow); + if (flow.dl_type == htons(ETH_TYPE_IP) + && flow.nw_proto == IPPROTO_TCP + && (is_openflow_port(flow.tp_src, ctx->argv + 2) || + is_openflow_port(flow.tp_dst, ctx->argv + 2))) { + struct dp_packet *payload = tcp_reader_run(reader, &flow, packet); + if (payload) { + while (dp_packet_size(payload) >= sizeof(struct ofp_header)) { + const struct ofp_header *oh; + void *data = dp_packet_data(payload); + int length; + + /* Align OpenFlow on 8-byte boundary for safe access. */ + dp_packet_shift(payload, -((intptr_t) data & 7)); + + oh = dp_packet_data(payload); + length = ntohs(oh->length); + if (dp_packet_size(payload) < length) { + break; + } + + if (!first) { + putchar('\n'); + } + first = false; + + if (timestamp) { + char *s = xastrftime_msec("%H:%M:%S.### ", when, true); + fputs(s, stdout); + free(s); + } + + printf(IP_FMT".%"PRIu16" > "IP_FMT".%"PRIu16":\n", + IP_ARGS(flow.nw_src), ntohs(flow.tp_src), + IP_ARGS(flow.nw_dst), ntohs(flow.tp_dst)); + ofp_print(stdout, dp_packet_data(payload), length, verbosity + 1); + dp_packet_pull(payload, length); + } + } + } + dp_packet_delete(packet); + } + tcp_reader_close(reader); +} + static void -ofctl_ping(int argc, char *argv[]) +ofctl_ping(struct ovs_cmdl_context *ctx) { size_t max_payload = 65535 - sizeof(struct ofp_header); unsigned int payload; struct vconn *vconn; int i; - payload = argc > 2 ? atoi(argv[2]) : 64; + payload = ctx->argc > 2 ? atoi(ctx->argv[2]) : 64; if (payload > max_payload) { ovs_fatal(0, "payload must be between 0 and %"PRIuSIZE" bytes", max_payload); } - open_vconn(argv[1], &vconn); + open_vconn(ctx->argv[1], &vconn); for (i = 0; i < 10; i++) { struct timeval start, end; struct ofpbuf *request, *reply; @@ -1857,14 +2299,14 @@ ofctl_ping(int argc, char *argv[]) if (ofptype_pull(&type, reply) || type != OFPTYPE_ECHO_REPLY || reply->size != payload - || memcmp(request->l3, reply->l3, payload)) { + || memcmp(request->msg, reply->msg, payload)) { printf("Reply does not match request. Request:\n"); ofp_print(stdout, request, request->size, verbosity + 2); printf("Reply:\n"); ofp_print(stdout, reply, reply->size, verbosity + 2); } - printf("%"PRIuSIZE" bytes from %s: xid=%08"PRIx32" time=%.1f ms\n", - reply->size, argv[1], ntohl(rpy_hdr->xid), + printf("%"PRIu32" bytes from %s: xid=%08"PRIx32" time=%.1f ms\n", + reply->size, ctx->argv[1], ntohl(rpy_hdr->xid), (1000*(double)(end.tv_sec - start.tv_sec)) + (.001*(end.tv_usec - start.tv_usec))); ofpbuf_delete(request); @@ -1874,7 +2316,7 @@ ofctl_ping(int argc, char *argv[]) } static void -ofctl_benchmark(int argc OVS_UNUSED, char *argv[]) +ofctl_benchmark(struct ovs_cmdl_context *ctx) { size_t max_payload = 65535 - sizeof(struct ofp_header); struct timeval start, end; @@ -1884,18 +2326,18 @@ ofctl_benchmark(int argc OVS_UNUSED, char *argv[]) int count; int i; - payload_size = atoi(argv[2]); + payload_size = atoi(ctx->argv[2]); if (payload_size > max_payload) { ovs_fatal(0, "payload must be between 0 and %"PRIuSIZE" bytes", max_payload); } message_size = sizeof(struct ofp_header) + payload_size; - count = atoi(argv[3]); + count = atoi(ctx->argv[3]); printf("Sending %d packets * %u bytes (with header) = %u bytes total\n", count, message_size, count * message_size); - open_vconn(argv[1], &vconn); + open_vconn(ctx->argv[1], &vconn); xgettimeofday(&start); for (i = 0; i < count; i++) { struct ofpbuf *request, *reply; @@ -1918,19 +2360,22 @@ ofctl_benchmark(int argc OVS_UNUSED, char *argv[]) static void ofctl_group_mod__(const char *remote, struct ofputil_group_mod *gms, - size_t n_gms) + size_t n_gms, enum ofputil_protocol usable_protocols) { + enum ofputil_protocol protocol; struct ofputil_group_mod *gm; + enum ofp_version version; struct ofpbuf *request; struct vconn *vconn; size_t i; - open_vconn(remote, &vconn); + protocol = open_vconn_for_flow_mod(remote, &vconn, usable_protocols); + version = ofputil_protocol_to_ofp_version(protocol); for (i = 0; i < n_gms; i++) { gm = &gms[i]; - request = ofputil_encode_group_mod(vconn_get_version(vconn), gm); + request = ofputil_encode_group_mod(version, gm); if (request) { transact_noreply(vconn, request); } @@ -1948,13 +2393,17 @@ ofctl_group_mod_file(int argc OVS_UNUSED, char *argv[], uint16_t command) enum ofputil_protocol usable_protocols; size_t n_gms = 0; char *error; + int i; error = parse_ofp_group_mod_file(argv[2], command, &gms, &n_gms, &usable_protocols); if (error) { ovs_fatal(0, "%s", error); } - ofctl_group_mod__(argv[1], gms, n_gms); + ofctl_group_mod__(argv[1], gms, n_gms, usable_protocols); + for (i = 0; i < n_gms; i++) { + ofputil_bucket_list_destroy(&gms[i].buckets); + } free(gms); } @@ -1973,36 +2422,49 @@ ofctl_group_mod(int argc, char *argv[], uint16_t command) if (error) { ovs_fatal(0, "%s", error); } - ofctl_group_mod__(argv[1], &gm, 1); + ofctl_group_mod__(argv[1], &gm, 1, usable_protocols); + ofputil_bucket_list_destroy(&gm.buckets); } } static void -ofctl_add_group(int argc, char *argv[]) +ofctl_add_group(struct ovs_cmdl_context *ctx) +{ + ofctl_group_mod(ctx->argc, ctx->argv, OFPGC11_ADD); +} + +static void +ofctl_add_groups(struct ovs_cmdl_context *ctx) { - ofctl_group_mod(argc, argv, OFPGC11_ADD); + ofctl_group_mod_file(ctx->argc, ctx->argv, OFPGC11_ADD); } static void -ofctl_add_groups(int argc, char *argv[]) +ofctl_mod_group(struct ovs_cmdl_context *ctx) { - ofctl_group_mod_file(argc, argv, OFPGC11_ADD); + ofctl_group_mod(ctx->argc, ctx->argv, OFPGC11_MODIFY); } static void -ofctl_mod_group(int argc, char *argv[]) +ofctl_del_groups(struct ovs_cmdl_context *ctx) { - ofctl_group_mod(argc, argv, OFPGC11_MODIFY); + ofctl_group_mod(ctx->argc, ctx->argv, OFPGC11_DELETE); } static void -ofctl_del_groups(int argc, char *argv[]) +ofctl_insert_bucket(struct ovs_cmdl_context *ctx) { - ofctl_group_mod(argc, argv, OFPGC11_DELETE); + ofctl_group_mod(ctx->argc, ctx->argv, OFPGC15_INSERT_BUCKET); } static void -ofctl_dump_group_stats(int argc, char *argv[]) +ofctl_remove_bucket(struct ovs_cmdl_context *ctx) +{ + ofctl_group_mod(ctx->argc, ctx->argv, OFPGC15_REMOVE_BUCKET); +} + +static void +ofctl_dump_group_stats(struct ovs_cmdl_context *ctx) { enum ofputil_protocol usable_protocols; struct ofputil_group_mod gm; @@ -2014,7 +2476,7 @@ ofctl_dump_group_stats(int argc, char *argv[]) memset(&gm, 0, sizeof gm); error = parse_ofp_group_mod_str(&gm, OFPGC11_DELETE, - argc > 2 ? argv[2] : "", + ctx->argc > 2 ? ctx->argv[2] : "", &usable_protocols); if (error) { ovs_fatal(0, "%s", error); @@ -2022,7 +2484,7 @@ ofctl_dump_group_stats(int argc, char *argv[]) group_id = gm.group_id; - open_vconn(argv[1], &vconn); + open_vconn(ctx->argv[1], &vconn); request = ofputil_encode_group_stats_request(vconn_get_version(vconn), group_id); if (request) { @@ -2033,14 +2495,20 @@ ofctl_dump_group_stats(int argc, char *argv[]) } static void -ofctl_dump_group_desc(int argc OVS_UNUSED, char *argv[]) +ofctl_dump_group_desc(struct ovs_cmdl_context *ctx) { struct ofpbuf *request; struct vconn *vconn; + uint32_t group_id; - open_vconn(argv[1], &vconn); + open_vconn(ctx->argv[1], &vconn); - request = ofputil_encode_group_desc_request(vconn_get_version(vconn)); + if (ctx->argc < 3 || !ofputil_group_from_string(ctx->argv[2], &group_id)) { + group_id = OFPG_ALL; + } + + request = ofputil_encode_group_desc_request(vconn_get_version(vconn), + group_id); if (request) { dump_stats_transaction(vconn, request); } @@ -2049,12 +2517,12 @@ ofctl_dump_group_desc(int argc OVS_UNUSED, char *argv[]) } static void -ofctl_dump_group_features(int argc OVS_UNUSED, char *argv[]) +ofctl_dump_group_features(struct ovs_cmdl_context *ctx) { struct ofpbuf *request; struct vconn *vconn; - open_vconn(argv[1], &vconn); + open_vconn(ctx->argv[1], &vconn); request = ofputil_encode_group_features_request(vconn_get_version(vconn)); if (request) { dump_stats_transaction(vconn, request); @@ -2064,13 +2532,106 @@ ofctl_dump_group_features(int argc OVS_UNUSED, char *argv[]) } static void -ofctl_help(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) +ofctl_tlv_mod(struct ovs_cmdl_context *ctx, uint16_t command) +{ + enum ofputil_protocol usable_protocols; + enum ofputil_protocol protocol; + struct ofputil_tlv_table_mod ttm; + char *error; + enum ofp_version version; + struct ofpbuf *request; + struct vconn *vconn; + + error = parse_ofp_tlv_table_mod_str(&ttm, command, ctx->argc > 2 ? + ctx->argv[2] : "", + &usable_protocols); + if (error) { + ovs_fatal(0, "%s", error); + } + + protocol = open_vconn_for_flow_mod(ctx->argv[1], &vconn, usable_protocols); + version = ofputil_protocol_to_ofp_version(protocol); + + request = ofputil_encode_tlv_table_mod(version, &ttm); + if (request) { + transact_noreply(vconn, request); + } + + vconn_close(vconn); + ofputil_uninit_tlv_table(&ttm.mappings); +} + +static void +ofctl_add_tlv_map(struct ovs_cmdl_context *ctx) +{ + ofctl_tlv_mod(ctx, NXTTMC_ADD); +} + +static void +ofctl_del_tlv_map(struct ovs_cmdl_context *ctx) +{ + ofctl_tlv_mod(ctx, ctx->argc > 2 ? NXTTMC_DELETE : NXTTMC_CLEAR); +} + +static void +ofctl_dump_tlv_map(struct ovs_cmdl_context *ctx) +{ + dump_trivial_transaction(ctx->argv[1], OFPRAW_NXT_TLV_TABLE_REQUEST); +} + +static void +ofctl_help(struct ovs_cmdl_context *ctx OVS_UNUSED) { usage(); } + +static void +ofctl_list_commands(struct ovs_cmdl_context *ctx OVS_UNUSED) +{ + ovs_cmdl_print_commands(get_all_commands()); +} /* replace-flows and diff-flows commands. */ +struct flow_tables { + struct classifier tables[OFPTT_MAX + 1]; +}; + +#define FOR_EACH_TABLE(CLS, TABLES) \ + for ((CLS) = (TABLES)->tables; \ + (CLS) < &(TABLES)->tables[ARRAY_SIZE((TABLES)->tables)]; \ + (CLS)++) + +static void +flow_tables_init(struct flow_tables *tables) +{ + struct classifier *cls; + + FOR_EACH_TABLE (cls, tables) { + classifier_init(cls, NULL); + } +} + +static void +flow_tables_defer(struct flow_tables *tables) +{ + struct classifier *cls; + + FOR_EACH_TABLE (cls, tables) { + classifier_defer(cls); + } +} + +static void +flow_tables_publish(struct flow_tables *tables) +{ + struct classifier *cls; + + FOR_EACH_TABLE (cls, tables) { + classifier_publish(cls); + } +} + /* A flow table entry, possibly with two different versions. */ struct fte { struct cls_rule rule; /* Within a "struct classifier". */ @@ -2082,9 +2643,11 @@ struct fte_version { ovs_be64 cookie; uint16_t idle_timeout; uint16_t hard_timeout; + uint16_t importance; uint16_t flags; struct ofpact *ofpacts; size_t ofpacts_len; + uint8_t table_id; }; /* Frees 'version' and the data that it owns. */ @@ -2092,7 +2655,7 @@ static void fte_version_free(struct fte_version *version) { if (version) { - free(version->ofpacts); + free(CONST_CAST(struct ofpact *, version->ofpacts)); free(version); } } @@ -2107,6 +2670,8 @@ fte_version_equals(const struct fte_version *a, const struct fte_version *b) return (a->cookie == b->cookie && a->idle_timeout == b->idle_timeout && a->hard_timeout == b->hard_timeout + && a->importance == b->importance + && a->table_id == b->table_id && ofpacts_equal(a->ofpacts, a->ofpacts_len, b->ofpacts, b->ofpacts_len)); } @@ -2123,6 +2688,9 @@ fte_version_format(const struct fte *fte, int index, struct ds *s) return; } + if (version->table_id) { + ds_put_format(s, "table=%"PRIu8" ", version->table_id); + } cls_rule_format(&fte->rule, s); if (version->cookie != htonll(0)) { ds_put_format(s, " cookie=0x%"PRIx64, ntohll(version->cookie)); @@ -2133,6 +2701,9 @@ fte_version_format(const struct fte *fte, int index, struct ds *s) if (version->hard_timeout != OFP_FLOW_PERMANENT) { ds_put_format(s, " hard_timeout=%"PRIu16, version->hard_timeout); } + if (version->importance != 0) { + ds_put_format(s, " importance=%"PRIu16, version->importance); + } ds_put_cstr(s, " actions="); ofpacts_format(version->ofpacts, version->ofpacts_len, s); @@ -2158,54 +2729,56 @@ fte_free(struct fte *fte) } } -/* Frees all of the FTEs within 'cls'. */ +/* Frees all of the FTEs within 'tables'. */ static void -fte_free_all(struct classifier *cls) +fte_free_all(struct flow_tables *tables) { - struct cls_cursor cursor; - struct fte *fte, *next; + struct classifier *cls; + + FOR_EACH_TABLE (cls, tables) { + struct fte *fte; - ovs_rwlock_wrlock(&cls->rwlock); - cls_cursor_init(&cursor, cls, NULL); - CLS_CURSOR_FOR_EACH_SAFE (fte, next, rule, &cursor) { - classifier_remove(cls, &fte->rule); - fte_free(fte); + classifier_defer(cls); + CLS_FOR_EACH (fte, rule, cls) { + classifier_remove(cls, &fte->rule); + ovsrcu_postpone(fte_free, fte); + } + classifier_destroy(cls); } - ovs_rwlock_unlock(&cls->rwlock); - classifier_destroy(cls); } -/* Searches 'cls' for an FTE matching 'rule', inserting a new one if +/* Searches 'tables' for an FTE matching 'rule', inserting a new one if * necessary. Sets 'version' as the version of that rule with the given * 'index', replacing any existing version, if any. * * Takes ownership of 'version'. */ static void -fte_insert(struct classifier *cls, const struct match *match, - unsigned int priority, struct fte_version *version, int index) +fte_insert(struct flow_tables *tables, const struct match *match, + int priority, struct fte_version *version, int index) { + struct classifier *cls = &tables->tables[version->table_id]; struct fte *old, *fte; fte = xzalloc(sizeof *fte); cls_rule_init(&fte->rule, match, priority); fte->versions[index] = version; - ovs_rwlock_wrlock(&cls->rwlock); - old = fte_from_cls_rule(classifier_replace(cls, &fte->rule)); - ovs_rwlock_unlock(&cls->rwlock); + old = fte_from_cls_rule(classifier_replace(cls, &fte->rule, + CLS_MIN_VERSION, NULL, 0)); if (old) { - fte_version_free(old->versions[index]); fte->versions[!index] = old->versions[!index]; - cls_rule_destroy(&old->rule); - free(old); + old->versions[!index] = NULL; + + ovsrcu_postpone(fte_free, old); } } -/* Reads the flows in 'filename' as flow table entries in 'cls' for the version - * with the specified 'index'. Returns the flow formats able to represent the - * flows that were read. */ +/* Reads the flows in 'filename' as flow table entries in 'tables' for the + * version with the specified 'index'. Returns the flow formats able to + * represent the flows that were read. */ static enum ofputil_protocol -read_flows_from_file(const char *filename, struct classifier *cls, int index) +read_flows_from_file(const char *filename, struct flow_tables *tables, + int index) { enum ofputil_protocol usable_protocols; int line_number; @@ -2220,6 +2793,7 @@ read_flows_from_file(const char *filename, struct classifier *cls, int index) ds_init(&s); usable_protocols = OFPUTIL_P_ANY; line_number = 0; + flow_tables_defer(tables); while (!ds_get_preprocessed_line(&s, file, &line_number)) { struct fte_version *version; struct ofputil_flow_mod fm; @@ -2236,13 +2810,16 @@ read_flows_from_file(const char *filename, struct classifier *cls, int index) version->cookie = fm.new_cookie; version->idle_timeout = fm.idle_timeout; version->hard_timeout = fm.hard_timeout; + version->importance = fm.importance; version->flags = fm.flags & (OFPUTIL_FF_SEND_FLOW_REM | OFPUTIL_FF_EMERG); version->ofpacts = fm.ofpacts; version->ofpacts_len = fm.ofpacts_len; + version->table_id = fm.table_id != OFPTT_ALL ? fm.table_id : 0; - fte_insert(cls, &fm.match, fm.priority, version, index); + fte_insert(tables, &fm.match, fm.priority, version, index); } + flow_tables_publish(tables); ds_destroy(&s); if (file != stdin) { @@ -2289,7 +2866,7 @@ recv_flow_stats_reply(struct vconn *vconn, ovs_be32 send_xid, return true; case EOF: - more = ofpmp_more(reply->l2); + more = ofpmp_more(reply->header); ofpbuf_delete(reply); reply = NULL; if (!more) { @@ -2306,12 +2883,12 @@ recv_flow_stats_reply(struct vconn *vconn, ovs_be32 send_xid, } /* Reads the OpenFlow flow table from 'vconn', which has currently active flow - * format 'protocol', and adds them as flow table entries in 'cls' for the + * format 'protocol', and adds them as flow table entries in 'tables' for the * version with the specified 'index'. */ static void read_flows_from_switch(struct vconn *vconn, enum ofputil_protocol protocol, - struct classifier *cls, int index) + struct flow_tables *tables, int index) { struct ofputil_flow_stats_request fsr; struct ofputil_flow_stats fs; @@ -2323,6 +2900,7 @@ read_flows_from_switch(struct vconn *vconn, fsr.aggregate = false; match_init_catchall(&fsr.match); fsr.out_port = OFPP_ANY; + fsr.out_group = OFPG_ANY; fsr.table_id = 0xff; fsr.cookie = fsr.cookie_mask = htonll(0); request = ofputil_encode_flow_stats_request(&fsr, protocol); @@ -2331,6 +2909,7 @@ read_flows_from_switch(struct vconn *vconn, reply = NULL; ofpbuf_init(&ofpacts, 0); + flow_tables_defer(tables); while (recv_flow_stats_reply(vconn, send_xid, &reply, &fs, &ofpacts)) { struct fte_version *version; @@ -2338,36 +2917,41 @@ read_flows_from_switch(struct vconn *vconn, version->cookie = fs.cookie; version->idle_timeout = fs.idle_timeout; version->hard_timeout = fs.hard_timeout; + version->importance = fs.importance; version->flags = 0; version->ofpacts_len = fs.ofpacts_len; version->ofpacts = xmemdup(fs.ofpacts, fs.ofpacts_len); + version->table_id = fs.table_id; - fte_insert(cls, &fs.match, fs.priority, version, index); + fte_insert(tables, &fs.match, fs.priority, version, index); } + flow_tables_publish(tables); ofpbuf_uninit(&ofpacts); } static void fte_make_flow_mod(const struct fte *fte, int index, uint16_t command, - enum ofputil_protocol protocol, struct list *packets) + enum ofputil_protocol protocol, struct ovs_list *packets) { const struct fte_version *version = fte->versions[index]; - struct ofputil_flow_mod fm; struct ofpbuf *ofm; + struct ofputil_flow_mod fm = { + .priority = fte->rule.priority, + .new_cookie = version->cookie, + .modify_cookie = true, + .table_id = version->table_id, + .command = command, + .idle_timeout = version->idle_timeout, + .hard_timeout = version->hard_timeout, + .importance = version->importance, + .buffer_id = UINT32_MAX, + .out_port = OFPP_ANY, + .out_group = OFPG_ANY, + .flags = version->flags, + .delete_reason = OFPRR_DELETE, + }; minimatch_expand(&fte->rule.match, &fm.match); - fm.priority = fte->rule.priority; - fm.cookie = htonll(0); - fm.cookie_mask = htonll(0); - fm.new_cookie = version->cookie; - fm.modify_cookie = true; - fm.table_id = 0xff; - fm.command = command; - fm.idle_timeout = version->idle_timeout; - fm.hard_timeout = version->hard_timeout; - fm.buffer_id = UINT32_MAX; - fm.out_port = OFPP_ANY; - fm.flags = version->flags; if (command == OFPFC_ADD || command == OFPFC_MODIFY || command == OFPFC_MODIFY_STRICT) { fm.ofpacts = version->ofpacts; @@ -2382,119 +2966,124 @@ fte_make_flow_mod(const struct fte *fte, int index, uint16_t command, } static void -ofctl_replace_flows(int argc OVS_UNUSED, char *argv[]) +ofctl_replace_flows(struct ovs_cmdl_context *ctx) { enum { FILE_IDX = 0, SWITCH_IDX = 1 }; enum ofputil_protocol usable_protocols, protocol; - struct cls_cursor cursor; - struct classifier cls; - struct list requests; + struct flow_tables tables; + struct classifier *cls; + struct ovs_list requests; struct vconn *vconn; struct fte *fte; - classifier_init(&cls, NULL); - usable_protocols = read_flows_from_file(argv[2], &cls, FILE_IDX); + flow_tables_init(&tables); + usable_protocols = read_flows_from_file(ctx->argv[2], &tables, FILE_IDX); - protocol = open_vconn(argv[1], &vconn); + protocol = open_vconn(ctx->argv[1], &vconn); protocol = set_protocol_for_flow_dump(vconn, protocol, usable_protocols); - read_flows_from_switch(vconn, protocol, &cls, SWITCH_IDX); + read_flows_from_switch(vconn, protocol, &tables, SWITCH_IDX); list_init(&requests); - /* Delete flows that exist on the switch but not in the file. */ - ovs_rwlock_rdlock(&cls.rwlock); - cls_cursor_init(&cursor, &cls, NULL); - CLS_CURSOR_FOR_EACH (fte, rule, &cursor) { - struct fte_version *file_ver = fte->versions[FILE_IDX]; - struct fte_version *sw_ver = fte->versions[SWITCH_IDX]; + FOR_EACH_TABLE (cls, &tables) { + /* Delete flows that exist on the switch but not in the file. */ + CLS_FOR_EACH (fte, rule, cls) { + struct fte_version *file_ver = fte->versions[FILE_IDX]; + struct fte_version *sw_ver = fte->versions[SWITCH_IDX]; - if (sw_ver && !file_ver) { - fte_make_flow_mod(fte, SWITCH_IDX, OFPFC_DELETE_STRICT, - protocol, &requests); + if (sw_ver && !file_ver) { + fte_make_flow_mod(fte, SWITCH_IDX, OFPFC_DELETE_STRICT, + protocol, &requests); + } } - } - /* Add flows that exist in the file but not on the switch. - * Update flows that exist in both places but differ. */ - cls_cursor_init(&cursor, &cls, NULL); - CLS_CURSOR_FOR_EACH (fte, rule, &cursor) { - struct fte_version *file_ver = fte->versions[FILE_IDX]; - struct fte_version *sw_ver = fte->versions[SWITCH_IDX]; + /* Add flows that exist in the file but not on the switch. + * Update flows that exist in both places but differ. */ + CLS_FOR_EACH (fte, rule, cls) { + struct fte_version *file_ver = fte->versions[FILE_IDX]; + struct fte_version *sw_ver = fte->versions[SWITCH_IDX]; - if (file_ver - && (readd || !sw_ver || !fte_version_equals(sw_ver, file_ver))) { - fte_make_flow_mod(fte, FILE_IDX, OFPFC_ADD, protocol, &requests); + if (file_ver && + (readd || !sw_ver || !fte_version_equals(sw_ver, file_ver))) { + fte_make_flow_mod(fte, FILE_IDX, OFPFC_ADD, protocol, + &requests); + } } } - ovs_rwlock_unlock(&cls.rwlock); - transact_multiple_noreply(vconn, &requests); + if (bundle) { + bundle_transact(vconn, &requests, OFPBF_ORDERED | OFPBF_ATOMIC); + } else { + transact_multiple_noreply(vconn, &requests); + } + + ofpbuf_list_delete(&requests); vconn_close(vconn); - fte_free_all(&cls); + fte_free_all(&tables); } static void -read_flows_from_source(const char *source, struct classifier *cls, int index) +read_flows_from_source(const char *source, struct flow_tables *tables, + int index) { struct stat s; if (source[0] == '/' || source[0] == '.' || (!strchr(source, ':') && !stat(source, &s))) { - read_flows_from_file(source, cls, index); + read_flows_from_file(source, tables, index); } else { enum ofputil_protocol protocol; struct vconn *vconn; protocol = open_vconn(source, &vconn); protocol = set_protocol_for_flow_dump(vconn, protocol, OFPUTIL_P_ANY); - read_flows_from_switch(vconn, protocol, cls, index); + read_flows_from_switch(vconn, protocol, tables, index); vconn_close(vconn); } } static void -ofctl_diff_flows(int argc OVS_UNUSED, char *argv[]) +ofctl_diff_flows(struct ovs_cmdl_context *ctx) { bool differences = false; - struct cls_cursor cursor; - struct classifier cls; + struct flow_tables tables; + struct classifier *cls; struct ds a_s, b_s; struct fte *fte; - classifier_init(&cls, NULL); - read_flows_from_source(argv[1], &cls, 0); - read_flows_from_source(argv[2], &cls, 1); + flow_tables_init(&tables); + read_flows_from_source(ctx->argv[1], &tables, 0); + read_flows_from_source(ctx->argv[2], &tables, 1); ds_init(&a_s); ds_init(&b_s); - ovs_rwlock_rdlock(&cls.rwlock); - cls_cursor_init(&cursor, &cls, NULL); - CLS_CURSOR_FOR_EACH (fte, rule, &cursor) { - struct fte_version *a = fte->versions[0]; - struct fte_version *b = fte->versions[1]; - - if (!a || !b || !fte_version_equals(a, b)) { - fte_version_format(fte, 0, &a_s); - fte_version_format(fte, 1, &b_s); - if (strcmp(ds_cstr(&a_s), ds_cstr(&b_s))) { - if (a_s.length) { - printf("-%s", ds_cstr(&a_s)); - } - if (b_s.length) { - printf("+%s", ds_cstr(&b_s)); + FOR_EACH_TABLE (cls, &tables) { + CLS_FOR_EACH (fte, rule, cls) { + struct fte_version *a = fte->versions[0]; + struct fte_version *b = fte->versions[1]; + + if (!a || !b || !fte_version_equals(a, b)) { + fte_version_format(fte, 0, &a_s); + fte_version_format(fte, 1, &b_s); + if (strcmp(ds_cstr(&a_s), ds_cstr(&b_s))) { + if (a_s.length) { + printf("-%s", ds_cstr(&a_s)); + } + if (b_s.length) { + printf("+%s", ds_cstr(&b_s)); + } + differences = true; } - differences = true; } } } - ovs_rwlock_unlock(&cls.rwlock); ds_destroy(&a_s); ds_destroy(&b_s); - fte_free_all(&cls); + fte_free_all(&tables); if (differences) { exit(2); @@ -2551,49 +3140,49 @@ ofctl_meter_request__(const char *bridge, const char *str, 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)); + dump_stats_transaction(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_add_meter(struct ovs_cmdl_context *ctx) { - ofctl_meter_mod__(argv[1], argv[2], OFPMC13_ADD); + ofctl_meter_mod__(ctx->argv[1], ctx->argv[2], OFPMC13_ADD); } static void -ofctl_mod_meter(int argc OVS_UNUSED, char *argv[]) +ofctl_mod_meter(struct ovs_cmdl_context *ctx) { - ofctl_meter_mod__(argv[1], argv[2], OFPMC13_MODIFY); + ofctl_meter_mod__(ctx->argv[1], ctx->argv[2], OFPMC13_MODIFY); } static void -ofctl_del_meters(int argc, char *argv[]) +ofctl_del_meters(struct ovs_cmdl_context *ctx) { - ofctl_meter_mod__(argv[1], argc > 2 ? argv[2] : NULL, OFPMC13_DELETE); + ofctl_meter_mod__(ctx->argv[1], ctx->argc > 2 ? ctx->argv[2] : NULL, OFPMC13_DELETE); } static void -ofctl_dump_meters(int argc, char *argv[]) +ofctl_dump_meters(struct ovs_cmdl_context *ctx) { - ofctl_meter_request__(argv[1], argc > 2 ? argv[2] : NULL, + ofctl_meter_request__(ctx->argv[1], ctx->argc > 2 ? ctx->argv[2] : NULL, OFPUTIL_METER_CONFIG); } static void -ofctl_meter_stats(int argc, char *argv[]) +ofctl_meter_stats(struct ovs_cmdl_context *ctx) { - ofctl_meter_request__(argv[1], argc > 2 ? argv[2] : NULL, + ofctl_meter_request__(ctx->argv[1], ctx->argc > 2 ? ctx->argv[2] : NULL, OFPUTIL_METER_STATS); } static void -ofctl_meter_features(int argc OVS_UNUSED, char *argv[]) +ofctl_meter_features(struct ovs_cmdl_context *ctx) { - ofctl_meter_request__(argv[1], NULL, OFPUTIL_METER_FEATURES); + ofctl_meter_request__(ctx->argv[1], NULL, OFPUTIL_METER_FEATURES); } @@ -2632,20 +3221,20 @@ ofctl_parse_flows__(struct ofputil_flow_mod *fms, size_t n_fms, ofp_print(stdout, msg->data, msg->size, verbosity); ofpbuf_delete(msg); - free(fm->ofpacts); + free(CONST_CAST(struct ofpact *, fm->ofpacts)); } } /* "parse-flow FLOW": parses the argument as a flow (like add-flow) and prints * it back to stdout. */ static void -ofctl_parse_flow(int argc OVS_UNUSED, char *argv[]) +ofctl_parse_flow(struct ovs_cmdl_context *ctx) { enum ofputil_protocol usable_protocols; struct ofputil_flow_mod fm; char *error; - error = parse_ofp_flow_mod_str(&fm, argv[1], OFPFC_ADD, &usable_protocols); + error = parse_ofp_flow_mod_str(&fm, ctx->argv[1], OFPFC_ADD, &usable_protocols); if (error) { ovs_fatal(0, "%s", error); } @@ -2655,14 +3244,14 @@ ofctl_parse_flow(int argc OVS_UNUSED, char *argv[]) /* "parse-flows FILENAME": reads the named file as a sequence of flows (like * add-flows) and prints each of the flows back to stdout. */ static void -ofctl_parse_flows(int argc OVS_UNUSED, char *argv[]) +ofctl_parse_flows(struct ovs_cmdl_context *ctx) { enum ofputil_protocol usable_protocols; struct ofputil_flow_mod *fms = NULL; size_t n_fms = 0; char *error; - error = parse_ofp_flow_mod_file(argv[1], OFPFC_ADD, &fms, &n_fms, + error = parse_ofp_flow_mod_file(ctx->argv[1], OFPFC_ADD, &fms, &n_fms, &usable_protocols); if (error) { ovs_fatal(0, "%s", error); @@ -2672,7 +3261,7 @@ ofctl_parse_flows(int argc OVS_UNUSED, char *argv[]) } static void -ofctl_parse_nxm__(bool oxm) +ofctl_parse_nxm__(bool oxm, enum ofp_version version) { struct ds in; @@ -2717,7 +3306,7 @@ ofctl_parse_nxm__(bool oxm) ofpbuf_uninit(&nx_match); ofpbuf_init(&nx_match, 0); if (oxm) { - match_len = oxm_put_match(&nx_match, &match); + match_len = oxm_put_match(&nx_match, &match, version); out = oxm_match_to_string(&nx_match, match_len); } else { match_len = nx_put_match(&nx_match, &match, @@ -2727,6 +3316,10 @@ ofctl_parse_nxm__(bool oxm) puts(out); free(out); + + if (verbosity > 0) { + ovs_hex_dump(stdout, nx_match.data, nx_match.size, 0, false); + } } else { printf("nx_pull_match() returned error %s\n", ofperr_get_name(error)); @@ -2741,18 +3334,24 @@ ofctl_parse_nxm__(bool oxm) * stdin, does some internal fussing with them, and then prints them back as * strings on stdout. */ static void -ofctl_parse_nxm(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) +ofctl_parse_nxm(struct ovs_cmdl_context *ctx OVS_UNUSED) { - return ofctl_parse_nxm__(false); + ofctl_parse_nxm__(false, 0); } -/* "parse-oxm": reads a series of OXM nx_match specifications as strings from - * stdin, does some internal fussing with them, and then prints them back as - * strings on stdout. */ +/* "parse-oxm VERSION": reads a series of OXM nx_match specifications as + * strings from stdin, does some internal fussing with them, and then prints + * them back as strings on stdout. VERSION must specify an OpenFlow version, + * e.g. "OpenFlow12". */ static void -ofctl_parse_oxm(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) +ofctl_parse_oxm(struct ovs_cmdl_context *ctx) { - return ofctl_parse_nxm__(true); + enum ofp_version version = ofputil_version_from_string(ctx->argv[1]); + if (version < OFP12_VERSION) { + ovs_fatal(0, "%s: not a valid version for OXM", ctx->argv[1]); + } + + ofctl_parse_nxm__(true, version); } static void @@ -2778,42 +3377,70 @@ print_differences(const char *prefix, } } -/* "parse-ofp10-actions": reads a series of OpenFlow 1.0 action specifications - * as hex bytes from stdin, converts them to ofpacts, prints them as strings - * on stdout, and then converts them back to hex bytes and prints any - * differences from the input. */ static void -ofctl_parse_ofp10_actions(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) +ofctl_parse_actions__(const char *version_s, bool instructions) { + enum ofp_version version; struct ds in; + version = ofputil_version_from_string(version_s); + if (!version) { + ovs_fatal(0, "%s: not a valid OpenFlow version", version_s); + } + ds_init(&in); while (!ds_get_preprocessed_line(&in, stdin, NULL)) { - struct ofpbuf of10_out; - struct ofpbuf of10_in; + struct ofpbuf of_out; + struct ofpbuf of_in; struct ofpbuf ofpacts; + const char *table_id; + char *actions; enum ofperr error; size_t size; struct ds s; + /* Parse table_id separated with the follow-up actions by ",", if + * any. */ + actions = ds_cstr(&in); + table_id = NULL; + if (strstr(actions, ",")) { + table_id = strsep(&actions, ","); + } + /* Parse hex bytes. */ - ofpbuf_init(&of10_in, 0); - if (ofpbuf_put_hex(&of10_in, ds_cstr(&in), NULL)[0] != '\0') { + ofpbuf_init(&of_in, 0); + if (ofpbuf_put_hex(&of_in, actions, NULL)[0] != '\0') { ovs_fatal(0, "Trailing garbage in hex data"); } /* Convert to ofpacts. */ ofpbuf_init(&ofpacts, 0); - size = of10_in.size; - error = ofpacts_pull_openflow_actions(&of10_in, of10_in.size, - OFP10_VERSION, &ofpacts); + size = of_in.size; + error = (instructions + ? ofpacts_pull_openflow_instructions + : ofpacts_pull_openflow_actions)( + &of_in, of_in.size, version, &ofpacts); + if (!error && instructions) { + /* Verify actions, enforce consistency. */ + enum ofputil_protocol protocol; + struct flow flow; + + memset(&flow, 0, sizeof flow); + protocol = ofputil_protocols_from_ofp_version(version); + error = ofpacts_check_consistency(ofpacts.data, ofpacts.size, + &flow, OFPP_MAX, + table_id ? atoi(table_id) : 0, + OFPTT_MAX + 1, protocol); + } if (error) { - printf("bad OF1.1 actions: %s\n\n", ofperr_get_name(error)); + printf("bad %s %s: %s\n\n", + version_s, instructions ? "instructions" : "actions", + ofperr_get_name(error)); ofpbuf_uninit(&ofpacts); - ofpbuf_uninit(&of10_in); + ofpbuf_uninit(&of_in); continue; } - ofpbuf_push_uninit(&of10_in, size); + ofpbuf_push_uninit(&of_in, size); /* Print cls_rule. */ ds_init(&s); @@ -2823,21 +3450,46 @@ ofctl_parse_ofp10_actions(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) ds_destroy(&s); /* Convert back to ofp10 actions and print differences from input. */ - ofpbuf_init(&of10_out, 0); - ofpacts_put_openflow_actions(ofpacts.data, ofpacts.size, &of10_out, - OFP10_VERSION); + ofpbuf_init(&of_out, 0); + if (instructions) { + ofpacts_put_openflow_instructions(ofpacts.data, ofpacts.size, + &of_out, version); + } else { + ofpacts_put_openflow_actions(ofpacts.data, ofpacts.size, + &of_out, version); + } - print_differences("", of10_in.data, of10_in.size, - of10_out.data, of10_out.size); + print_differences("", of_in.data, of_in.size, + of_out.data, of_out.size); putchar('\n'); ofpbuf_uninit(&ofpacts); - ofpbuf_uninit(&of10_in); - ofpbuf_uninit(&of10_out); + ofpbuf_uninit(&of_in); + ofpbuf_uninit(&of_out); } ds_destroy(&in); } +/* "parse-actions VERSION": reads a series of action specifications for the + * given OpenFlow VERSION as hex bytes from stdin, converts them to ofpacts, + * prints them as strings on stdout, and then converts them back to hex bytes + * and prints any differences from the input. */ +static void +ofctl_parse_actions(struct ovs_cmdl_context *ctx) +{ + ofctl_parse_actions__(ctx->argv[1], false); +} + +/* "parse-actions VERSION": reads a series of instruction specifications for + * the given OpenFlow VERSION as hex bytes from stdin, converts them to + * ofpacts, prints them as strings on stdout, and then converts them back to + * hex bytes and prints any differences from the input. */ +static void +ofctl_parse_instructions(struct ovs_cmdl_context *ctx) +{ + ofctl_parse_actions__(ctx->argv[1], true); +} + /* "parse-ofp10-match": reads a series of ofp10_match specifications as hex * bytes from stdin, converts them to cls_rules, prints them as strings on * stdout, and then converts them back to hex bytes and prints any differences @@ -2848,7 +3500,7 @@ ofctl_parse_ofp10_actions(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) * them back to hex bytes. ovs-ofctl actually sets "x"s to random bits when * it does the conversion to hex, to ensure that in fact they are ignored. */ static void -ofctl_parse_ofp10_match(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) +ofctl_parse_ofp10_match(struct ovs_cmdl_context *ctx OVS_UNUSED) { struct ds expout; struct ds in; @@ -2875,7 +3527,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 %"PRIuSIZE" bytes, expected %"PRIuSIZE, + ovs_fatal(0, "Input is %"PRIu32" bytes, expected %"PRIuSIZE, match_expout.size, sizeof(struct ofp10_match)); } @@ -2890,7 +3542,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 %"PRIuSIZE" bytes, expected %"PRIuSIZE, + ovs_fatal(0, "Input is %"PRIu32" bytes, expected %"PRIuSIZE, match_in.size, sizeof(struct ofp10_match)); } @@ -2922,7 +3574,7 @@ ofctl_parse_ofp10_match(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) * on stdout, and then converts them back to hex bytes and prints any * differences from the input. */ static void -ofctl_parse_ofp11_match(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) +ofctl_parse_ofp11_match(struct ovs_cmdl_context *ctx OVS_UNUSED) { struct ds in; @@ -2939,7 +3591,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 %"PRIuSIZE" bytes, expected %"PRIuSIZE, + ovs_fatal(0, "Input is %"PRIu32" bytes, expected %"PRIuSIZE, match_in.size, sizeof(struct ofp11_match)); } @@ -2966,180 +3618,41 @@ ofctl_parse_ofp11_match(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) ds_destroy(&in); } -/* "parse-ofp11-actions": reads a series of OpenFlow 1.1 action specifications - * as hex bytes from stdin, converts them to ofpacts, prints them as strings - * on stdout, and then converts them back to hex bytes and prints any - * differences from the input. */ -static void -ofctl_parse_ofp11_actions(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) -{ - struct ds in; - - ds_init(&in); - while (!ds_get_preprocessed_line(&in, stdin, NULL)) { - struct ofpbuf of11_out; - struct ofpbuf of11_in; - struct ofpbuf ofpacts; - enum ofperr error; - size_t size; - struct ds s; - - /* Parse hex bytes. */ - ofpbuf_init(&of11_in, 0); - if (ofpbuf_put_hex(&of11_in, ds_cstr(&in), NULL)[0] != '\0') { - ovs_fatal(0, "Trailing garbage in hex data"); - } - - /* Convert to ofpacts. */ - ofpbuf_init(&ofpacts, 0); - size = of11_in.size; - 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); - ofpbuf_uninit(&of11_in); - continue; - } - ofpbuf_push_uninit(&of11_in, size); - - /* 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_openflow_actions(ofpacts.data, ofpacts.size, &of11_out, - OFP11_VERSION); - - print_differences("", of11_in.data, of11_in.size, - of11_out.data, of11_out.size); - putchar('\n'); - - ofpbuf_uninit(&ofpacts); - ofpbuf_uninit(&of11_in); - ofpbuf_uninit(&of11_out); - } - ds_destroy(&in); -} - -/* "parse-ofp11-instructions": reads a series of OpenFlow 1.1 instruction - * specifications as hex bytes from stdin, converts them to ofpacts, prints - * them as strings on stdout, and then converts them back to hex bytes and - * prints any differences from the input. */ -static void -ofctl_parse_ofp11_instructions(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) -{ - struct ds in; - - ds_init(&in); - while (!ds_get_preprocessed_line(&in, stdin, NULL)) { - struct ofpbuf of11_out; - struct ofpbuf of11_in; - struct ofpbuf ofpacts; - enum ofperr error; - size_t size; - struct ds s; - const char *table_id; - char *instructions; - - /* Parse table_id separated with the follow-up instructions by ",", if - * any. */ - instructions = ds_cstr(&in); - table_id = NULL; - if (strstr(instructions, ",")) { - table_id = strsep(&instructions, ","); - } - - /* Parse hex bytes. */ - ofpbuf_init(&of11_in, 0); - if (ofpbuf_put_hex(&of11_in, instructions, NULL)[0] != '\0') { - ovs_fatal(0, "Trailing garbage in hex data"); - } - - /* Convert to ofpacts. */ - ofpbuf_init(&ofpacts, 0); - size = of11_in.size; - error = ofpacts_pull_openflow_instructions(&of11_in, of11_in.size, - OFP11_VERSION, &ofpacts); - if (!error) { - /* Verify actions, enforce consistency. */ - struct flow flow; - memset(&flow, 0, sizeof flow); - 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)); - ofpbuf_uninit(&ofpacts); - ofpbuf_uninit(&of11_in); - continue; - } - ofpbuf_push_uninit(&of11_in, size); - - /* 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 instructions and print differences from - * input. */ - ofpbuf_init(&of11_out, 0); - 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); - putchar('\n'); - - ofpbuf_uninit(&ofpacts); - ofpbuf_uninit(&of11_in); - ofpbuf_uninit(&of11_out); - } - 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[]) +ofctl_parse_pcap(struct ovs_cmdl_context *ctx) { FILE *pcap; - pcap = pcap_open(argv[1], "rb"); + pcap = ovs_pcap_open(ctx->argv[1], "rb"); if (!pcap) { - ovs_fatal(errno, "%s: open failed", argv[1]); + ovs_fatal(errno, "%s: open failed", ctx->argv[1]); } for (;;) { - struct ofpbuf *packet; + struct dp_packet *packet; struct flow flow; int error; - error = pcap_read(pcap, &packet); + error = ovs_pcap_read(pcap, &packet, NULL); if (error == EOF) { break; } else if (error) { - ovs_fatal(error, "%s: read failed", argv[1]); + ovs_fatal(error, "%s: read failed", ctx->argv[1]); } - flow_extract(packet, 0, 0, NULL, NULL, &flow); + pkt_metadata_init(&packet->md, ODPP_NONE); + flow_extract(packet, &flow); flow_print(stdout, &flow); putchar('\n'); - ofpbuf_delete(packet); + dp_packet_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 -ofctl_check_vlan(int argc OVS_UNUSED, char *argv[]) +ofctl_check_vlan(struct ovs_cmdl_context *ctx) { struct match match; @@ -3163,8 +3676,8 @@ ofctl_check_vlan(int argc OVS_UNUSED, char *argv[]) enum ofputil_protocol usable_protocols; /* Unused for now. */ match_init_catchall(&match); - match.flow.vlan_tci = htons(strtoul(argv[1], NULL, 16)); - match.wc.masks.vlan_tci = htons(strtoul(argv[2], NULL, 16)); + match.flow.vlan_tci = htons(strtoul(ctx->argv[1], NULL, 16)); + match.wc.masks.vlan_tci = htons(strtoul(ctx->argv[2], NULL, 16)); /* Convert to and from string. */ string_s = match_to_string(&match, OFP_DEFAULT_PRIORITY); @@ -3197,7 +3710,7 @@ ofctl_check_vlan(int argc OVS_UNUSED, char *argv[]) /* Convert to and from OXM. */ ofpbuf_init(&nxm, 0); - nxm_match_len = oxm_put_match(&nxm, &match); + nxm_match_len = oxm_put_match(&nxm, &match, OFP12_VERSION); nxm_s = oxm_match_to_string(&nxm, nxm_match_len); error = oxm_pull_match(&nxm, &nxm_match); printf("OXM: %s -> ", nxm_s); @@ -3245,14 +3758,14 @@ ofctl_check_vlan(int argc OVS_UNUSED, char *argv[]) /* "print-error ENUM": Prints the type and code of ENUM for every OpenFlow * version. */ static void -ofctl_print_error(int argc OVS_UNUSED, char *argv[]) +ofctl_print_error(struct ovs_cmdl_context *ctx) { enum ofperr error; int version; - error = ofperr_from_name(argv[1]); + error = ofperr_from_name(ctx->argv[1]); if (!error) { - ovs_fatal(0, "unknown error \"%s\"", argv[1]); + ovs_fatal(0, "unknown error \"%s\"", ctx->argv[1]); } for (version = 0; version <= UINT8_MAX; version++) { @@ -3273,19 +3786,19 @@ ofctl_print_error(int argc OVS_UNUSED, char *argv[]) /* "encode-error-reply ENUM REQUEST": Encodes an error reply to REQUEST for the * error named ENUM and prints the error reply in hex. */ static void -ofctl_encode_error_reply(int argc OVS_UNUSED, char *argv[]) +ofctl_encode_error_reply(struct ovs_cmdl_context *ctx) { const struct ofp_header *oh; struct ofpbuf request, *reply; enum ofperr error; - error = ofperr_from_name(argv[1]); + error = ofperr_from_name(ctx->argv[1]); if (!error) { - ovs_fatal(0, "unknown error \"%s\"", argv[1]); + ovs_fatal(0, "unknown error \"%s\"", ctx->argv[1]); } ofpbuf_init(&request, 0); - if (ofpbuf_put_hex(&request, argv[2], NULL)[0] != '\0') { + if (ofpbuf_put_hex(&request, ctx->argv[2], NULL)[0] != '\0') { ovs_fatal(0, "Trailing garbage in hex data"); } if (request.size < sizeof(struct ofp_header)) { @@ -3306,26 +3819,49 @@ ofctl_encode_error_reply(int argc OVS_UNUSED, char *argv[]) /* "ofp-print HEXSTRING [VERBOSITY]": Converts the hex digits in HEXSTRING into * binary data, interpreting them as an OpenFlow message, and prints the - * OpenFlow message on stdout, at VERBOSITY (level 2 by default). */ + * OpenFlow message on stdout, at VERBOSITY (level 2 by default). + * + * Alternative usage: "ofp-print [VERBOSITY] - < HEXSTRING_FILE", where + * HEXSTRING_FILE contains the HEXSTRING. */ static void -ofctl_ofp_print(int argc, char *argv[]) +ofctl_ofp_print(struct ovs_cmdl_context *ctx) { struct ofpbuf packet; + char *buffer; + int verbosity = 2; + struct ds line; + + ds_init(&line); + + if (!strcmp(ctx->argv[ctx->argc-1], "-")) { + if (ds_get_line(&line, stdin)) { + VLOG_FATAL("Failed to read stdin"); + } + + buffer = line.string; + verbosity = ctx->argc > 2 ? atoi(ctx->argv[1]) : verbosity; + } else if (ctx->argc > 2) { + buffer = ctx->argv[1]; + verbosity = atoi(ctx->argv[2]); + } else { + buffer = ctx->argv[1]; + } - ofpbuf_init(&packet, strlen(argv[1]) / 2); - if (ofpbuf_put_hex(&packet, argv[1], NULL)[0] != '\0') { + ofpbuf_init(&packet, strlen(buffer) / 2); + if (ofpbuf_put_hex(&packet, buffer, NULL)[0] != '\0') { ovs_fatal(0, "trailing garbage following hex bytes"); } - ofp_print(stdout, packet.data, packet.size, argc > 2 ? atoi(argv[2]) : 2); + ofp_print(stdout, packet.data, packet.size, verbosity); ofpbuf_uninit(&packet); + ds_destroy(&line); } /* "encode-hello BITMAP...": Encodes each BITMAP as an OpenFlow hello message * and dumps each message in hex. */ static void -ofctl_encode_hello(int argc OVS_UNUSED, char *argv[]) +ofctl_encode_hello(struct ovs_cmdl_context *ctx) { - uint32_t bitmap = strtol(argv[1], NULL, 0); + uint32_t bitmap = strtol(ctx->argv[1], NULL, 0); struct ofpbuf *hello; hello = ofputil_encode_hello(bitmap); @@ -3334,73 +3870,131 @@ ofctl_encode_hello(int argc OVS_UNUSED, char *argv[]) ofpbuf_delete(hello); } -static const struct command all_commands[] = { - { "show", 1, 1, ofctl_show }, - { "monitor", 1, 3, ofctl_monitor }, - { "snoop", 1, 1, ofctl_snoop }, - { "dump-desc", 1, 1, ofctl_dump_desc }, - { "dump-tables", 1, 1, ofctl_dump_tables }, - { "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 }, - { "probe", 1, 1, ofctl_probe }, - { "ping", 1, 2, ofctl_ping }, - { "benchmark", 3, 3, ofctl_benchmark }, - - { "add-group", 1, 2, ofctl_add_group }, - { "add-groups", 1, 2, ofctl_add_groups }, - { "mod-group", 1, 2, ofctl_mod_group }, - { "del-groups", 1, 2, ofctl_del_groups }, - { "dump-groups", 1, 1, ofctl_dump_group_desc }, - { "dump-group-stats", 1, 2, ofctl_dump_group_stats }, - { "dump-group-features", 1, 1, ofctl_dump_group_features }, - { "help", 0, INT_MAX, ofctl_help }, +static const struct ovs_cmdl_command all_commands[] = { + { "show", "switch", + 1, 1, ofctl_show }, + { "monitor", "switch [misslen] [invalid_ttl] [watch:[...]]", + 1, 3, ofctl_monitor }, + { "snoop", "switch", + 1, 1, ofctl_snoop }, + { "dump-desc", "switch", + 1, 1, ofctl_dump_desc }, + { "dump-tables", "switch", + 1, 1, ofctl_dump_tables }, + { "dump-table-features", "switch", + 1, 1, ofctl_dump_table_features }, + { "dump-table-desc", "switch", + 1, 1, ofctl_dump_table_desc }, + { "dump-flows", "switch", + 1, 2, ofctl_dump_flows }, + { "dump-aggregate", "switch", + 1, 2, ofctl_dump_aggregate }, + { "queue-stats", "switch [port [queue]]", + 1, 3, ofctl_queue_stats }, + { "queue-get-config", "switch [port]", + 1, 2, ofctl_queue_get_config }, + { "add-flow", "switch flow", + 2, 2, ofctl_add_flow }, + { "add-flows", "switch file", + 2, 2, ofctl_add_flows }, + { "mod-flows", "switch flow", + 2, 2, ofctl_mod_flows }, + { "del-flows", "switch [flow]", + 1, 2, ofctl_del_flows }, + { "replace-flows", "switch file", + 2, 2, ofctl_replace_flows }, + { "diff-flows", "source1 source2", + 2, 2, ofctl_diff_flows }, + { "add-meter", "switch meter", + 2, 2, ofctl_add_meter }, + { "mod-meter", "switch meter", + 2, 2, ofctl_mod_meter }, + { "del-meter", "switch meter", + 2, 2, ofctl_del_meters }, + { "del-meters", "switch", + 1, 1, ofctl_del_meters }, + { "dump-meter", "switch meter", + 2, 2, ofctl_dump_meters }, + { "dump-meters", "switch", + 1, 1, ofctl_dump_meters }, + { "meter-stats", "switch [meter]", + 1, 2, ofctl_meter_stats }, + { "meter-features", "switch", + 1, 1, ofctl_meter_features }, + { "packet-out", "switch in_port actions packet...", + 4, INT_MAX, ofctl_packet_out }, + { "dump-ports", "switch [port]", + 1, 2, ofctl_dump_ports }, + { "dump-ports-desc", "switch [port]", + 1, 2, ofctl_dump_ports_desc }, + { "mod-port", "switch iface act", + 3, 3, ofctl_mod_port }, + { "mod-table", "switch mod", + 3, 3, ofctl_mod_table }, + { "get-frags", "switch", + 1, 1, ofctl_get_frags }, + { "set-frags", "switch frag_mode", + 2, 2, ofctl_set_frags }, + { "probe", "target", + 1, 1, ofctl_probe }, + { "ping", "target [n]", + 1, 2, ofctl_ping }, + { "benchmark", "target n count", + 3, 3, ofctl_benchmark }, + + { "ofp-parse", "file", + 1, 1, ofctl_ofp_parse }, + { "ofp-parse-pcap", "pcap", + 1, INT_MAX, ofctl_ofp_parse_pcap }, + + { "add-group", "switch group", + 1, 2, ofctl_add_group }, + { "add-groups", "switch file", + 1, 2, ofctl_add_groups }, + { "mod-group", "switch group", + 1, 2, ofctl_mod_group }, + { "del-groups", "switch [group]", + 1, 2, ofctl_del_groups }, + { "insert-buckets", "switch [group]", + 1, 2, ofctl_insert_bucket }, + { "remove-buckets", "switch [group]", + 1, 2, ofctl_remove_bucket }, + { "dump-groups", "switch [group]", + 1, 2, ofctl_dump_group_desc }, + { "dump-group-stats", "switch [group]", + 1, 2, ofctl_dump_group_stats }, + { "dump-group-features", "switch", + 1, 1, ofctl_dump_group_features }, + { "add-tlv-map", "switch map", + 2, 2, ofctl_add_tlv_map }, + { "del-tlv-map", "switch [map]", + 1, 2, ofctl_del_tlv_map }, + { "dump-tlv-map", "switch", + 1, 1, ofctl_dump_tlv_map }, + { "help", NULL, 0, INT_MAX, ofctl_help }, + { "list-commands", NULL, 0, INT_MAX, ofctl_list_commands }, /* Undocumented commands for testing. */ - { "parse-flow", 1, 1, ofctl_parse_flow }, - { "parse-flows", 1, 1, ofctl_parse_flows }, - { "parse-nx-match", 0, 0, ofctl_parse_nxm }, - { "parse-nxm", 0, 0, ofctl_parse_nxm }, - { "parse-oxm", 0, 0, ofctl_parse_oxm }, - { "parse-ofp10-actions", 0, 0, ofctl_parse_ofp10_actions }, - { "parse-ofp10-match", 0, 0, ofctl_parse_ofp10_match }, - { "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 }, - { "ofp-print", 1, 2, ofctl_ofp_print }, - { "encode-hello", 1, 1, ofctl_encode_hello }, - - { NULL, 0, 0, NULL }, + { "parse-flow", NULL, 1, 1, ofctl_parse_flow }, + { "parse-flows", NULL, 1, 1, ofctl_parse_flows }, + { "parse-nx-match", NULL, 0, 0, ofctl_parse_nxm }, + { "parse-nxm", NULL, 0, 0, ofctl_parse_nxm }, + { "parse-oxm", NULL, 1, 1, ofctl_parse_oxm }, + { "parse-actions", NULL, 1, 1, ofctl_parse_actions }, + { "parse-instructions", NULL, 1, 1, ofctl_parse_instructions }, + { "parse-ofp10-match", NULL, 0, 0, ofctl_parse_ofp10_match }, + { "parse-ofp11-match", NULL, 0, 0, ofctl_parse_ofp11_match }, + { "parse-pcap", NULL, 1, 1, ofctl_parse_pcap }, + { "check-vlan", NULL, 2, 2, ofctl_check_vlan }, + { "print-error", NULL, 1, 1, ofctl_print_error }, + { "encode-error-reply", NULL, 2, 2, ofctl_encode_error_reply }, + { "ofp-print", NULL, 1, 2, ofctl_ofp_print }, + { "encode-hello", NULL, 1, 1, ofctl_encode_hello }, + + { NULL, NULL, 0, 0, NULL }, }; -static const struct command *get_all_commands(void) +static const struct ovs_cmdl_command *get_all_commands(void) { return all_commands; }