X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-ofctl.c;h=8f021929beb79d6be0c3617c401e1c38803b8373;hb=6dc5374435cc25bc4051b27bd52635e609a8872a;hp=3d3a7b7632f5fc4a7496ddce474426532fe90264;hpb=ca8526e01561671273655e0c28b545736b1d1506;p=sliver-openvswitch.git diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c index 3d3a7b763..deba9dd78 100644 --- a/utilities/ovs-ofctl.c +++ b/utilities/ovs-ofctl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,6 +15,7 @@ */ #include +#include #include #include #include @@ -24,6 +25,7 @@ #include #include #include +#include #include #include @@ -34,25 +36,33 @@ #include "compiler.h" #include "dirs.h" #include "dynamic-string.h" -#include "netlink.h" +#include "fatal-signal.h" #include "nx-match.h" #include "odp-util.h" +#include "ofp-actions.h" #include "ofp-errors.h" +#include "ofp-msgs.h" #include "ofp-parse.h" #include "ofp-print.h" #include "ofp-util.h" +#include "ofp-version-opt.h" #include "ofpbuf.h" #include "ofproto/ofproto.h" #include "openflow/nicira-ext.h" #include "openflow/openflow.h" +#include "packets.h" +#include "pcap-file.h" #include "poll-loop.h" #include "random.h" #include "stream-ssl.h" +#include "socket-util.h" #include "timeval.h" #include "unixctl.h" #include "util.h" #include "vconn.h" #include "vlog.h" +#include "meta-flow.h" +#include "sort.h" VLOG_DEFINE_THIS_MODULE(ofctl); @@ -65,9 +75,9 @@ static bool strict; * (to reset flow counters). */ static bool readd; -/* -F, --flow-format: Flow format to use. Either one of NXFF_* to force a - * particular flow format or -1 to let ovs-ofctl choose intelligently. */ -static int preferred_flow_format = -1; +/* -F, --flow-format: Allowed protocols. By default, any protocol is + * allowed. */ +static enum ofputil_protocol allowed_protocols = OFPUTIL_P_ANY; /* -P, --packet-in-format: Packet IN format to use in monitor and snoop * commands. Either one of NXPIF_* to force a particular packet_in format, or @@ -77,45 +87,109 @@ static int preferred_packet_in_format = -1; /* -m, --more: Additional verbosity for ofp-print functions. */ static int verbosity; -static const struct command all_commands[]; +/* --timestamp: Print a timestamp before each received packet on "monitor" and + * "snoop" command? */ +static bool timestamp; + +/* --sort, --rsort: Sort order. */ +enum sort_order { SORT_ASC, SORT_DESC }; +struct sort_criterion { + const struct mf_field *field; /* NULL means to sort by priority. */ + enum sort_order order; +}; +static struct sort_criterion *criteria; +static size_t n_criteria, allocated_criteria; + +static const struct command *get_all_commands(void); static void usage(void) NO_RETURN; static void parse_options(int argc, char *argv[]); +static bool recv_flow_stats_reply(struct vconn *, ovs_be32 send_xid, + struct ofpbuf **replyp, + struct ofputil_flow_stats *, + struct ofpbuf *ofpacts); int main(int argc, char *argv[]) { set_program_name(argv[0]); parse_options(argc, argv); - signal(SIGPIPE, SIG_IGN); - run_command(argc - optind, argv + optind, all_commands); + fatal_ignore_sigpipe(); + run_command(argc - optind, argv + optind, get_all_commands()); return 0; } +static void +add_sort_criterion(enum sort_order order, const char *field) +{ + struct sort_criterion *sc; + + if (n_criteria >= allocated_criteria) { + criteria = x2nrealloc(criteria, &allocated_criteria, sizeof *criteria); + } + + sc = &criteria[n_criteria++]; + if (!field || !strcasecmp(field, "priority")) { + sc->field = NULL; + } else { + sc->field = mf_from_name(field); + if (!sc->field) { + ovs_fatal(0, "%s: unknown field name", field); + } + } + sc->order = order; +} + static void parse_options(int argc, char *argv[]) { enum { OPT_STRICT = UCHAR_MAX + 1, OPT_READD, + OPT_TIMESTAMP, + OPT_SORT, + OPT_RSORT, DAEMON_OPTION_ENUMS, + OFP_VERSION_OPTION_ENUMS, VLOG_OPTION_ENUMS }; - static struct option long_options[] = { + static const struct option long_options[] = { {"timeout", required_argument, NULL, 't'}, {"strict", no_argument, NULL, OPT_STRICT}, {"readd", no_argument, NULL, OPT_READD}, {"flow-format", required_argument, NULL, 'F'}, {"packet-in-format", required_argument, NULL, 'P'}, {"more", no_argument, NULL, 'm'}, + {"timestamp", no_argument, NULL, OPT_TIMESTAMP}, + {"sort", optional_argument, NULL, OPT_SORT}, + {"rsort", optional_argument, NULL, OPT_RSORT}, {"help", no_argument, NULL, 'h'}, - {"version", no_argument, NULL, 'V'}, 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); + 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; @@ -138,9 +212,9 @@ parse_options(int argc, char *argv[]) break; case 'F': - preferred_flow_format = ofputil_flow_format_from_string(optarg); - if (preferred_flow_format < 0) { - ovs_fatal(0, "unknown flow format `%s'", optarg); + allowed_protocols = ofputil_protocols_from_string(optarg); + if (!allowed_protocols) { + ovs_fatal(0, "%s: invalid flow format(s)", optarg); } break; @@ -159,10 +233,6 @@ parse_options(int argc, char *argv[]) case 'h': usage(); - case 'V': - ovs_print_version(OFP_VERSION, OFP_VERSION); - exit(EXIT_SUCCESS); - case OPT_STRICT: strict = true; break; @@ -171,7 +241,20 @@ parse_options(int argc, char *argv[]) readd = true; break; + case OPT_TIMESTAMP: + timestamp = true; + break; + + case OPT_SORT: + add_sort_criterion(SORT_ASC, optarg); + break; + + case OPT_RSORT: + add_sort_criterion(SORT_DESC, optarg); + break; + DAEMON_OPTION_HANDLERS + OFP_VERSION_OPTION_HANDLERS VLOG_OPTION_HANDLERS STREAM_SSL_OPTION_HANDLERS @@ -182,7 +265,29 @@ parse_options(int argc, char *argv[]) abort(); } } + + if (n_criteria) { + /* Always do a final sort pass based on priority. */ + add_sort_criterion(SORT_DESC, "priority"); + } + free(short_options); + + versions = get_allowed_ofp_versions(); + version_protocols = ofputil_protocols_from_version_bitmap(versions); + if (!(allowed_protocols & version_protocols)) { + char *protocols = ofputil_protocols_to_string(allowed_protocols); + struct ds version_s = DS_EMPTY_INITIALIZER; + + ofputil_format_version_bitmap_names(&version_s, versions); + ovs_fatal(0, "None of the enabled OpenFlow versions (%s) supports " + "any of the enabled flow formats (%s). (Use -O to enable " + "additional OpenFlow versions or -F to enable additional " + "flow formats.)", ds_cstr(&version_s), protocols); + } + allowed_protocols &= version_protocols; + mask_allowed_ofp_versions(ofputil_protocols_to_version_bitmap( + allowed_protocols)); } static void @@ -194,10 +299,13 @@ 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" " mod-port SWITCH IFACE ACT modify port behavior\n" + " mod-table SWITCH MOD modify flow table behavior\n" " get-frags SWITCH print fragment handling behavior\n" " set-frags SWITCH FRAG_MODE set fragment handling behavior\n" " dump-ports SWITCH [PORT] print port statistics\n" + " dump-ports-desc SWITCH 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" @@ -208,15 +316,40 @@ usage(void) " mod-flows SWITCH FLOW modify actions of matching FLOWs\n" " del-flows SWITCH [FLOW] delete matching FLOWs\n" " replace-flows SWITCH FILE replace flows with those in FILE\n" - " monitor SWITCH [MISSLEN] print packets received from SWITCH\n" + " diff-flows SOURCE1 SOURCE2 compare flows from two sources\n" + " packet-out SWITCH IN_PORT ACTIONS PACKET...\n" + " execute ACTIONS on PACKET\n" + " monitor SWITCH [MISSLEN] [invalid_ttl] [watch:[...]]\n" + " 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" + " mod-group SWITCH GROUP modify specific group\n" + " del-groups SWITCH [GROUP] delete matching GROUPs\n" + " dump-group-features SWITCH print group features\n" + " dump-groups SWITCH print group description\n" + " dump-group-stats SWITCH [GROUP] print group statistics\n" + " queue-get-config SWITCH PORT print queue information for port\n" + " add-meter SWITCH METER add meter described by METER\n" + " mod-meter SWITCH METER modify specific METER\n" + " del-meter SWITCH METER delete METER\n" + " del-meters SWITCH delete all meters\n" + " dump-meter SWITCH METER print METER configuration\n" + " dump-meters SWITCH print all meter configuration\n" + " meter-stats SWITCH [METER] print meter statistics\n" + " meter-features SWITCH print meter features\n" "\nFor OpenFlow switches and controllers:\n" " probe TARGET probe whether TARGET is up\n" " ping TARGET [N] latency of N-byte echos\n" " benchmark TARGET N COUNT bandwidth of COUNT N-byte echos\n" - "where SWITCH or TARGET is an active OpenFlow connection method.\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-pcap PCAP print OpenFlow read from PCAP\n", program_name, program_name); vconn_usage(true, false, false); daemon_usage(); + ofp_version_usage(); vlog_usage(); printf("\nOther options:\n" " --strict use strict match for flow commands\n" @@ -224,7 +357,10 @@ usage(void) " -F, --flow-format=FORMAT force particular flow format\n" " -P, --packet-in-format=FRMT force particular packet in format\n" " -m, --more be more verbose printing OpenFlow\n" + " --timestamp (monitor, snoop) print timestamps\n" " -t, --timeout=SECS give up after SECS seconds\n" + " --sort[=field] sort in ascending order\n" + " --rsort[=field] sort in descending order\n" " -h, --help display this help message\n" " -V, --version display version information\n"); exit(EXIT_SUCCESS); @@ -236,13 +372,14 @@ ofctl_exit(struct unixctl_conn *conn, int argc OVS_UNUSED, { bool *exiting = exiting_; *exiting = true; - unixctl_command_reply(conn, 200, ""); + unixctl_command_reply(conn, NULL); } static void run(int retval, const char *message, ...) PRINTF_FORMAT(2, 3); -static void run(int retval, const char *message, ...) +static void +run(int retval, const char *message, ...) { if (retval) { va_list args; @@ -254,140 +391,174 @@ static void run(int retval, const char *message, ...) /* Generic commands. */ -static void +static int open_vconn_socket(const char *name, struct vconn **vconnp) { char *vconn_name = xasprintf("unix:%s", name); - VLOG_DBG("connecting to %s", vconn_name); - run(vconn_open_block(vconn_name, OFP_VERSION, vconnp), - "connecting to %s", vconn_name); + int error; + + error = vconn_open(vconn_name, get_allowed_ofp_versions(), DSCP_DEFAULT, + vconnp); + if (error && error != ENOENT) { + ovs_fatal(0, "%s: failed to open socket (%s)", name, + ovs_strerror(error)); + } free(vconn_name); + + return error; } -static void -open_vconn__(const char *name, const char *default_suffix, +enum open_target { MGMT, SNOOP }; + +static enum ofputil_protocol +open_vconn__(const char *name, enum open_target target, struct vconn **vconnp) { + const char *suffix = target == MGMT ? "mgmt" : "snoop"; char *datapath_name, *datapath_type, *socket_name; + enum ofputil_protocol protocol; char *bridge_path; - struct stat s; + int ofp_version; + int error; - bridge_path = xasprintf("%s/%s.%s", ovs_rundir(), name, default_suffix); + bridge_path = xasprintf("%s/%s.%s", ovs_rundir(), name, suffix); ofproto_parse_name(name, &datapath_name, &datapath_type); - socket_name = xasprintf("%s/%s.%s", - ovs_rundir(), datapath_name, default_suffix); + socket_name = xasprintf("%s/%s.%s", ovs_rundir(), datapath_name, suffix); free(datapath_name); free(datapath_type); if (strchr(name, ':')) { - run(vconn_open_block(name, OFP_VERSION, vconnp), + run(vconn_open(name, get_allowed_ofp_versions(), DSCP_DEFAULT, vconnp), "connecting to %s", name); - } else if (!stat(name, &s) && S_ISSOCK(s.st_mode)) { - open_vconn_socket(name, vconnp); - } else if (!stat(bridge_path, &s) && S_ISSOCK(s.st_mode)) { - open_vconn_socket(bridge_path, vconnp); - } else if (!stat(socket_name, &s)) { - if (!S_ISSOCK(s.st_mode)) { - ovs_fatal(0, "cannot connect to %s: %s is not a socket", - name, socket_name); - } - open_vconn_socket(socket_name, vconnp); + } else if (!open_vconn_socket(name, vconnp)) { + /* Fall Through. */ + } else if (!open_vconn_socket(bridge_path, vconnp)) { + /* Fall Through. */ + } else if (!open_vconn_socket(socket_name, vconnp)) { + /* Fall Through. */ } else { ovs_fatal(0, "%s is not a bridge or a socket", name); } + if (target == SNOOP) { + vconn_set_recv_any_version(*vconnp); + } + free(bridge_path); free(socket_name); -} -static void -open_vconn(const char *name, struct vconn **vconnp) -{ - return open_vconn__(name, "mgmt", vconnp); + VLOG_DBG("connecting to %s", vconn_get_name(*vconnp)); + error = vconn_connect_block(*vconnp); + if (error) { + ovs_fatal(0, "%s: failed to connect to socket (%s)", name, + ovs_strerror(error)); + } + + ofp_version = vconn_get_version(*vconnp); + protocol = ofputil_protocol_from_ofp_version(ofp_version); + if (!protocol) { + ovs_fatal(0, "%s: unsupported OpenFlow version 0x%02x", + name, ofp_version); + } + return protocol; } -static void * -alloc_stats_request(size_t rq_len, uint16_t type, struct ofpbuf **bufferp) +static enum ofputil_protocol +open_vconn(const char *name, struct vconn **vconnp) { - struct ofp_stats_msg *rq; - - rq = make_openflow(rq_len, OFPT_STATS_REQUEST, bufferp); - rq->type = htons(type); - rq->flags = htons(0); - return rq; + return open_vconn__(name, MGMT, vconnp); } static void send_openflow_buffer(struct vconn *vconn, struct ofpbuf *buffer) { - update_openflow_length(buffer); + ofpmsg_update_length(buffer); run(vconn_send_block(vconn, buffer), "failed to send packet to switch"); } static void -dump_transaction(const char *vconn_name, struct ofpbuf *request) +dump_transaction(struct vconn *vconn, struct ofpbuf *request) { - struct vconn *vconn; struct ofpbuf *reply; - update_openflow_length(request); - open_vconn(vconn_name, &vconn); - run(vconn_transact(vconn, request, &reply), "talking to %s", vconn_name); - ofp_print(stdout, reply->data, reply->size, verbosity + 1); - vconn_close(vconn); + ofpmsg_update_length(request); + run(vconn_transact(vconn, request, &reply), "talking to %s", + vconn_get_name(vconn)); + ofp_print(stdout, ofpbuf_data(reply), ofpbuf_size(reply), verbosity + 1); + ofpbuf_delete(reply); } static void -dump_trivial_transaction(const char *vconn_name, uint8_t request_type) +dump_trivial_transaction(const char *vconn_name, enum ofpraw raw) { struct ofpbuf *request; - make_openflow(sizeof(struct ofp_header), request_type, &request); - dump_transaction(vconn_name, request); + struct vconn *vconn; + + open_vconn(vconn_name, &vconn); + request = ofpraw_alloc(raw, vconn_get_version(vconn), 0); + dump_transaction(vconn, request); + vconn_close(vconn); } static void -dump_stats_transaction(const char *vconn_name, struct ofpbuf *request) +dump_stats_transaction(struct vconn *vconn, struct ofpbuf *request) { - ovs_be32 send_xid = ((struct ofp_header *) request->data)->xid; - struct vconn *vconn; + const struct ofp_header *request_oh = ofpbuf_data(request); + ovs_be32 send_xid = request_oh->xid; + enum ofpraw request_raw; + enum ofpraw reply_raw; bool done = false; - open_vconn(vconn_name, &vconn); + ofpraw_decode_partial(&request_raw, ofpbuf_data(request), ofpbuf_size(request)); + reply_raw = ofpraw_stats_request_to_reply(request_raw, + request_oh->version); + send_openflow_buffer(vconn, request); while (!done) { ovs_be32 recv_xid; struct ofpbuf *reply; run(vconn_recv_block(vconn, &reply), "OpenFlow packet receive failed"); - recv_xid = ((struct ofp_header *) reply->data)->xid; + recv_xid = ((struct ofp_header *) ofpbuf_data(reply))->xid; if (send_xid == recv_xid) { - struct ofp_stats_msg *osm; + enum ofpraw raw; - ofp_print(stdout, reply->data, reply->size, verbosity + 1); + ofp_print(stdout, ofpbuf_data(reply), ofpbuf_size(reply), verbosity + 1); - osm = ofpbuf_at(reply, 0, sizeof *osm); - done = !osm || !(ntohs(osm->flags) & OFPSF_REPLY_MORE); + ofpraw_decode(&raw, ofpbuf_data(reply)); + if (ofptype_from_ofpraw(raw) == OFPTYPE_ERROR) { + done = true; + } else if (raw == reply_raw) { + done = !ofpmp_more(ofpbuf_data(reply)); + } else { + ovs_fatal(0, "received bad reply: %s", + ofp_to_string(ofpbuf_data(reply), ofpbuf_size(reply), + verbosity + 1)); + } } else { VLOG_DBG("received reply with xid %08"PRIx32" " "!= expected %08"PRIx32, recv_xid, send_xid); } ofpbuf_delete(reply); } - vconn_close(vconn); } static void -dump_trivial_stats_transaction(const char *vconn_name, uint8_t stats_type) +dump_trivial_stats_transaction(const char *vconn_name, enum ofpraw raw) { struct ofpbuf *request; - alloc_stats_request(sizeof(struct ofp_stats_msg), stats_type, &request); - dump_stats_transaction(vconn_name, request); + struct vconn *vconn; + + open_vconn(vconn_name, &vconn); + request = ofpraw_alloc(raw, vconn_get_version(vconn), 0); + dump_stats_transaction(vconn, request); + vconn_close(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. +/* Sends all of the 'requests', which should be requests that only have replies + * if an error occurs, and waits for them to succeed or fail. If an error does + * occur, prints it and exits with an error. * * Destroys all of the 'requests'. */ static void @@ -396,13 +567,13 @@ transact_multiple_noreply(struct vconn *vconn, struct list *requests) struct ofpbuf *request, *reply; LIST_FOR_EACH (request, list_node, requests) { - update_openflow_length(request); + ofpmsg_update_length(request); } run(vconn_transact_multiple_noreply(vconn, requests, &reply), "talking to %s", vconn_get_name(vconn)); if (reply) { - ofp_print(stderr, reply->data, reply->size, verbosity + 2); + ofp_print(stderr, ofpbuf_data(reply), ofpbuf_size(reply), verbosity + 2); exit(1); } ofpbuf_delete(reply); @@ -427,367 +598,634 @@ static void fetch_switch_config(struct vconn *vconn, struct ofp_switch_config *config_) { struct ofp_switch_config *config; - struct ofp_header *header; struct ofpbuf *request; struct ofpbuf *reply; + enum ofptype type; - make_openflow(sizeof(struct ofp_header), OFPT_GET_CONFIG_REQUEST, - &request); + request = ofpraw_alloc(OFPRAW_OFPT_GET_CONFIG_REQUEST, + vconn_get_version(vconn), 0); run(vconn_transact(vconn, request, &reply), "talking to %s", vconn_get_name(vconn)); - header = reply->data; - if (header->type != OFPT_GET_CONFIG_REPLY || - header->length != htons(sizeof *config)) { + if (ofptype_pull(&type, reply) || type != OFPTYPE_GET_CONFIG_REPLY) { ovs_fatal(0, "%s: bad reply to config request", vconn_get_name(vconn)); } - config = reply->data; + config = ofpbuf_pull(reply, sizeof *config); *config_ = *config; + + ofpbuf_delete(reply); } static void -set_switch_config(struct vconn *vconn, struct ofp_switch_config *config_) +set_switch_config(struct vconn *vconn, const struct ofp_switch_config *config) { - struct ofp_switch_config *config; - struct ofp_header save_header; struct ofpbuf *request; - config = make_openflow(sizeof *config, OFPT_SET_CONFIG, &request); - save_header = config->header; - *config = *config_; - config->header = save_header; + request = ofpraw_alloc(OFPRAW_OFPT_SET_CONFIG, vconn_get_version(vconn), 0); + ofpbuf_put(request, config, sizeof *config); transact_noreply(vconn, request); } static void -do_show(int argc OVS_UNUSED, char *argv[]) +ofctl_show(int argc OVS_UNUSED, char *argv[]) { - dump_trivial_transaction(argv[1], OFPT_FEATURES_REQUEST); - dump_trivial_transaction(argv[1], OFPT_GET_CONFIG_REQUEST); + const char *vconn_name = argv[1]; + struct vconn *vconn; + struct ofpbuf *request; + struct ofpbuf *reply; + bool trunc; + + 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); + + trunc = ofputil_switch_features_ports_trunc(reply); + ofp_print(stdout, ofpbuf_data(reply), ofpbuf_size(reply), 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); + } + dump_trivial_transaction(vconn_name, OFPRAW_OFPT_GET_CONFIG_REQUEST); + vconn_close(vconn); } static void -do_dump_desc(int argc OVS_UNUSED, char *argv[]) +ofctl_dump_desc(int argc OVS_UNUSED, char *argv[]) { - dump_trivial_stats_transaction(argv[1], OFPST_DESC); + dump_trivial_stats_transaction(argv[1], OFPRAW_OFPST_DESC_REQUEST); } static void -do_dump_tables(int argc OVS_UNUSED, char *argv[]) +ofctl_dump_tables(int argc OVS_UNUSED, char *argv[]) { - dump_trivial_stats_transaction(argv[1], OFPST_TABLE); + dump_trivial_stats_transaction(argv[1], OFPRAW_OFPST_TABLE_REQUEST); } -/* Opens a connection to 'vconn_name', fetches the ofp_phy_port structure for - * 'port_name' (which may be a port name or number), and copies it into - * '*oppp'. */ static void -fetch_ofp_phy_port(const char *vconn_name, const char *port_name, - struct ofp_phy_port *oppp) +ofctl_dump_table_features(int argc OVS_UNUSED, char *argv[]) { - struct ofpbuf *request, *reply; - struct ofp_switch_features *osf; - unsigned int port_no; + struct ofpbuf *request; struct vconn *vconn; - int n_ports; - int port_idx; - /* Try to interpret the argument as a port number. */ - if (!str_to_uint(port_name, 10, &port_no)) { - port_no = UINT_MAX; + open_vconn(argv[1], &vconn); + request = ofputil_encode_table_features_request(vconn_get_version(vconn)); + if (request) { + dump_stats_transaction(vconn, request); } + vconn_close(vconn); +} + +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) +{ + struct ofputil_switch_features features; + const struct ofp_header *oh; + struct ofpbuf *request, *reply; + struct vconn *vconn; + enum ofperr error; + enum ofptype type; + struct ofpbuf b; + bool found = false; + /* Fetch the switch's ofp_switch_features. */ - make_openflow(sizeof(struct ofp_header), OFPT_FEATURES_REQUEST, &request); 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); - osf = reply->data; - if (reply->size < sizeof *osf) { - ovs_fatal(0, "%s: received too-short features reply (only %zu bytes)", - vconn_name, reply->size); + oh = ofpbuf_data(reply); + if (ofptype_decode(&type, ofpbuf_data(reply)) + || type != OFPTYPE_FEATURES_REPLY) { + ovs_fatal(0, "%s: received bad features reply", vconn_name); } - n_ports = (reply->size - sizeof *osf) / sizeof *osf->ports; - for (port_idx = 0; port_idx < n_ports; port_idx++) { - const struct ofp_phy_port *opp = &osf->ports[port_idx]; + *trunc = false; + if (ofputil_switch_features_ports_trunc(reply)) { + *trunc = true; + goto exit; + } - if (port_no != UINT_MAX - ? htons(port_no) == opp->port_no - : !strncmp(opp->name, port_name, sizeof opp->name)) { - *oppp = *opp; - ofpbuf_delete(reply); - vconn_close(vconn); - return; + 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; + } + } + +exit: + ofpbuf_delete(reply); + return found; +} + +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; + bool done = false; + bool found = false; + + request = ofpraw_alloc(OFPRAW_OFPST_PORT_DESC_REQUEST, OFP10_VERSION, 0); + send_xid = ((struct ofp_header *) ofpbuf_data(request))->xid; + + open_vconn(vconn_name, &vconn); + send_openflow_buffer(vconn, request); + while (!done) { + ovs_be32 recv_xid; + struct ofpbuf *reply; + + run(vconn_recv_block(vconn, &reply), "OpenFlow packet receive failed"); + recv_xid = ((struct ofp_header *) ofpbuf_data(reply))->xid; + if (send_xid == recv_xid) { + struct ofp_header *oh = ofpbuf_data(reply); + 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(ofpbuf_data(reply), ofpbuf_size(reply), + verbosity + 1)); + } + + flags = ofpmp_flags(oh); + done = !(flags & OFPSF_REPLY_MORE); + + if (found) { + /* We've already found the port, but we need to drain + * the queue of any other replies for this request. */ + continue; + } + + 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; + } + } + } else { + VLOG_DBG("received reply with xid %08"PRIx32" " + "!= expected %08"PRIx32, recv_xid, send_xid); } + ofpbuf_delete(reply); + } + vconn_close(vconn); + + return found; +} + +static bool +str_to_ofp(const char *s, ofp_port_t *ofp_port) +{ + bool ret; + uint32_t port_; + + ret = str_to_uint(s, 10, &port_); + *ofp_port = u16_to_ofp(port_); + return ret; +} + +/* 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'. */ +static void +fetch_ofputil_phy_port(const char *vconn_name, const char *port_name, + struct ofputil_phy_port *pp) +{ + ofp_port_t port_no; + bool found; + bool trunc; + + /* 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); + } + + if (!found) { + ovs_fatal(0, "%s: couldn't find port `%s'", vconn_name, port_name); } - ovs_fatal(0, "%s: couldn't find port `%s'", vconn_name, port_name); } /* Returns the port number corresponding to 'port_name' (which may be a port * name or number) within the switch 'vconn_name'. */ -static uint16_t +static ofp_port_t str_to_port_no(const char *vconn_name, const char *port_name) { - unsigned int port_no; + ofp_port_t port_no; - if (str_to_uint(port_name, 10, &port_no)) { + if (ofputil_port_from_string(port_name, &port_no)) { return port_no; } else { - struct ofp_phy_port opp; + struct ofputil_phy_port pp; - fetch_ofp_phy_port(vconn_name, port_name, &opp); - return ntohs(opp.port_no); + fetch_ofputil_phy_port(vconn_name, port_name, &pp); + return pp.port_no; } } static bool -try_set_flow_format(struct vconn *vconn, enum nx_flow_format flow_format) +try_set_protocol(struct vconn *vconn, enum ofputil_protocol want, + enum ofputil_protocol *cur) { - struct ofpbuf *sff, *reply; + for (;;) { + struct ofpbuf *request, *reply; + enum ofputil_protocol next; - sff = ofputil_make_set_flow_format(flow_format); - run(vconn_transact_noreply(vconn, sff, &reply), - "talking to %s", vconn_get_name(vconn)); - if (reply) { - char *s = ofp_to_string(reply->data, reply->size, 2); - VLOG_DBG("%s: failed to set flow format %s, controller replied: %s", - vconn_get_name(vconn), - ofputil_flow_format_to_string(flow_format), - s); - free(s); - ofpbuf_delete(reply); - return false; + request = ofputil_encode_set_protocol(*cur, want, &next); + if (!request) { + return *cur == want; + } + + run(vconn_transact_noreply(vconn, request, &reply), + "talking to %s", vconn_get_name(vconn)); + if (reply) { + char *s = ofp_to_string(ofpbuf_data(reply), ofpbuf_size(reply), 2); + VLOG_DBG("%s: failed to set protocol, switch replied: %s", + vconn_get_name(vconn), s); + free(s); + ofpbuf_delete(reply); + return false; + } + + *cur = next; } - return true; } -static void -set_flow_format(struct vconn *vconn, enum nx_flow_format flow_format) +static enum ofputil_protocol +set_protocol_for_flow_dump(struct vconn *vconn, + enum ofputil_protocol cur_protocol, + enum ofputil_protocol usable_protocols) { - struct ofpbuf *sff = ofputil_make_set_flow_format(flow_format); - transact_noreply(vconn, sff); - VLOG_DBG("%s: using user-specified flow format %s", - vconn_get_name(vconn), - ofputil_flow_format_to_string(flow_format)); -} + char *usable_s; + int i; -static enum nx_flow_format -negotiate_highest_flow_format(struct vconn *vconn, - enum nx_flow_format min_format) -{ - if (preferred_flow_format != -1) { - if (preferred_flow_format < min_format) { - ovs_fatal(0, "%s: cannot use requested flow format %s for " - "specified flow", vconn_get_name(vconn), - ofputil_flow_format_to_string(min_format)); + for (i = 0; i < ofputil_n_flow_dump_protocols; i++) { + enum ofputil_protocol f = ofputil_flow_dump_protocols[i]; + if (f & usable_protocols & allowed_protocols + && try_set_protocol(vconn, f, &cur_protocol)) { + return f; } + } - set_flow_format(vconn, preferred_flow_format); - return preferred_flow_format; + usable_s = ofputil_protocols_to_string(usable_protocols); + if (usable_protocols & allowed_protocols) { + ovs_fatal(0, "switch does not support any of the usable flow " + "formats (%s)", usable_s); } else { - enum nx_flow_format flow_format; - - if (try_set_flow_format(vconn, NXFF_NXM)) { - flow_format = NXFF_NXM; - } else { - flow_format = NXFF_OPENFLOW10; - } + char *allowed_s = ofputil_protocols_to_string(allowed_protocols); + ovs_fatal(0, "none of the usable flow formats (%s) is among the " + "allowed flow formats (%s)", usable_s, allowed_s); + } +} - if (flow_format < min_format) { - ovs_fatal(0, "%s: cannot use switch's most advanced flow format " - "%s for specified flow", vconn_get_name(vconn), - ofputil_flow_format_to_string(min_format)); - } +static struct vconn * +prepare_dump_flows(int argc, char *argv[], bool aggregate, + struct ofpbuf **requestp) +{ + enum ofputil_protocol usable_protocols, protocol; + struct ofputil_flow_stats_request fsr; + struct vconn *vconn; + char *error; - VLOG_DBG("%s: negotiated flow format %s", vconn_get_name(vconn), - ofputil_flow_format_to_string(flow_format)); - return flow_format; + error = parse_ofp_flow_stats_request_str(&fsr, aggregate, + argc > 2 ? argv[2] : "", + &usable_protocols); + if (error) { + ovs_fatal(0, "%s", error); } + + protocol = open_vconn(argv[1], &vconn); + protocol = set_protocol_for_flow_dump(vconn, protocol, usable_protocols); + *requestp = ofputil_encode_flow_stats_request(&fsr, protocol); + return vconn; } static void -do_dump_flows__(int argc, char *argv[], bool aggregate) +ofctl_dump_flows__(int argc, char *argv[], bool aggregate) { - enum nx_flow_format min_flow_format, flow_format; - struct ofputil_flow_stats_request fsr; struct ofpbuf *request; struct vconn *vconn; - parse_ofp_flow_stats_request_str(&fsr, aggregate, argc > 2 ? argv[2] : ""); + vconn = prepare_dump_flows(argc, argv, aggregate, &request); + dump_stats_transaction(vconn, request); + vconn_close(vconn); +} - open_vconn(argv[1], &vconn); - min_flow_format = ofputil_min_flow_format(&fsr.match); - if (fsr.cookie_mask != htonll(0)) { - min_flow_format = NXFF_NXM; +static int +compare_flows(const void *afs_, const void *bfs_) +{ + const struct ofputil_flow_stats *afs = afs_; + const struct ofputil_flow_stats *bfs = bfs_; + const struct match *a = &afs->match; + const struct match *b = &bfs->match; + const struct sort_criterion *sc; + + for (sc = criteria; sc < &criteria[n_criteria]; sc++) { + const struct mf_field *f = sc->field; + int ret; + + if (!f) { + unsigned int a_pri = afs->priority; + unsigned int b_pri = bfs->priority; + ret = a_pri < b_pri ? -1 : a_pri > b_pri; + } else { + bool ina, inb; + + ina = mf_are_prereqs_ok(f, &a->flow) && !mf_is_all_wild(f, &a->wc); + inb = mf_are_prereqs_ok(f, &b->flow) && !mf_is_all_wild(f, &b->wc); + if (ina != inb) { + /* Skip the test for sc->order, so that missing fields always + * sort to the end whether we're sorting in ascending or + * descending order. */ + return ina ? -1 : 1; + } else { + union mf_value aval, bval; + + mf_get_value(f, &a->flow, &aval); + mf_get_value(f, &b->flow, &bval); + ret = memcmp(&aval, &bval, f->n_bytes); + } + } + + if (ret) { + return sc->order == SORT_ASC ? ret : -ret; + } } - flow_format = negotiate_highest_flow_format(vconn, min_flow_format); - request = ofputil_encode_flow_stats_request(&fsr, flow_format); - dump_stats_transaction(argv[1], request); - vconn_close(vconn); + + return 0; } static void -do_dump_flows(int argc, char *argv[]) +ofctl_dump_flows(int argc, char *argv[]) { - return do_dump_flows__(argc, argv, false); + if (!n_criteria) { + return ofctl_dump_flows__(argc, argv, false); + } else { + struct ofputil_flow_stats *fses; + size_t n_fses, allocated_fses; + struct ofpbuf *request; + struct ofpbuf ofpacts; + struct ofpbuf *reply; + struct vconn *vconn; + ovs_be32 send_xid; + struct ds s; + size_t i; + + vconn = prepare_dump_flows(argc, argv, false, &request); + send_xid = ((struct ofp_header *) ofpbuf_data(request))->xid; + send_openflow_buffer(vconn, request); + + fses = NULL; + n_fses = allocated_fses = 0; + reply = NULL; + ofpbuf_init(&ofpacts, 0); + for (;;) { + struct ofputil_flow_stats *fs; + + if (n_fses >= allocated_fses) { + fses = x2nrealloc(fses, &allocated_fses, sizeof *fses); + } + + fs = &fses[n_fses]; + if (!recv_flow_stats_reply(vconn, send_xid, &reply, fs, + &ofpacts)) { + break; + } + fs->ofpacts = xmemdup(fs->ofpacts, fs->ofpacts_len); + n_fses++; + } + ofpbuf_uninit(&ofpacts); + + qsort(fses, n_fses, sizeof *fses, compare_flows); + + ds_init(&s); + for (i = 0; i < n_fses; i++) { + ds_clear(&s); + ofp_print_flow_stats(&s, &fses[i]); + puts(ds_cstr(&s)); + } + ds_destroy(&s); + + for (i = 0; i < n_fses; i++) { + free(CONST_CAST(struct ofpact *, fses[i].ofpacts)); + } + free(fses); + + vconn_close(vconn); + } } static void -do_dump_aggregate(int argc, char *argv[]) +ofctl_dump_aggregate(int argc, char *argv[]) { - return do_dump_flows__(argc, argv, true); + return ofctl_dump_flows__(argc, argv, true); } static void -do_queue_stats(int argc, char *argv[]) +ofctl_queue_stats(int argc, char *argv[]) { - struct ofp_queue_stats_request *req; struct ofpbuf *request; + struct vconn *vconn; + struct ofputil_queue_stats_request oqs; - req = alloc_stats_request(sizeof *req, OFPST_QUEUE, &request); + open_vconn(argv[1], &vconn); if (argc > 2 && argv[2][0] && strcasecmp(argv[2], "all")) { - req->port_no = htons(str_to_port_no(argv[1], argv[2])); + oqs.port_no = str_to_port_no(argv[1], argv[2]); } else { - req->port_no = htons(OFPP_ALL); + oqs.port_no = OFPP_ANY; } if (argc > 3 && argv[3][0] && strcasecmp(argv[3], "all")) { - req->queue_id = htonl(atoi(argv[3])); + oqs.queue_id = atoi(argv[3]); } else { - req->queue_id = htonl(OFPQ_ALL); + oqs.queue_id = OFPQ_ALL; } - memset(req->pad, 0, sizeof req->pad); - - dump_stats_transaction(argv[1], request); + request = ofputil_encode_queue_stats_request(vconn_get_version(vconn), &oqs); + dump_stats_transaction(vconn, request); + vconn_close(vconn); } -/* Sets up the flow format for a vconn that will be used to modify the flow - * table. Returns the flow format used, after possibly adding an OpenFlow - * request to 'requests'. - * - * If 'preferred_flow_format' is -1, returns NXFF_OPENFLOW10 without modifying - * 'requests', since NXFF_OPENFLOW10 is the default flow format for any - * OpenFlow connection. - * - * If 'preferred_flow_format' is a specific format, adds a request to set that - * format to 'requests' and returns the format. */ -static enum nx_flow_format -set_initial_format_for_flow_mod(struct list *requests) +static void +ofctl_queue_get_config(int argc OVS_UNUSED, char *argv[]) { - if (preferred_flow_format < 0) { - return NXFF_OPENFLOW10; - } else { - struct ofpbuf *sff; + 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; - sff = ofputil_make_set_flow_format(preferred_flow_format); - list_push_back(requests, &sff->list_node); - return preferred_flow_format; - } + port = str_to_port_no(vconn_name, port_name); + + protocol = open_vconn(vconn_name, &vconn); + version = ofputil_protocol_to_ofp_version(protocol); + request = ofputil_encode_queue_get_config_request(version, port); + dump_transaction(vconn, request); + vconn_close(vconn); } -/* Checks that 'flow_format' is acceptable as a flow format after a flow_mod - * operation, given the global 'preferred_flow_format'. */ -static void -check_final_format_for_flow_mod(enum nx_flow_format flow_format) +static enum ofputil_protocol +open_vconn_for_flow_mod(const char *remote, struct vconn **vconnp, + enum ofputil_protocol usable_protocols) { - if (preferred_flow_format >= 0 && flow_format > preferred_flow_format) { - ovs_fatal(0, "flow cannot be expressed in flow format %s " - "(flow format %s or better is required)", - ofputil_flow_format_to_string(preferred_flow_format), - ofputil_flow_format_to_string(flow_format)); + enum ofputil_protocol cur_protocol; + char *usable_s; + int i; + + if (!(usable_protocols & allowed_protocols)) { + char *allowed_s = ofputil_protocols_to_string(allowed_protocols); + usable_s = ofputil_protocols_to_string(usable_protocols); + ovs_fatal(0, "none of the usable flow formats (%s) is among the " + "allowed flow formats (%s)", usable_s, allowed_s); + } + + /* If the initial flow format is allowed and usable, keep it. */ + cur_protocol = open_vconn(remote, vconnp); + if (usable_protocols & allowed_protocols & cur_protocol) { + return cur_protocol; + } + + /* Otherwise try each flow format in turn. */ + for (i = 0; i < sizeof(enum ofputil_protocol) * CHAR_BIT; i++) { + enum ofputil_protocol f = 1 << i; + + if (f != cur_protocol + && f & usable_protocols & allowed_protocols + && try_set_protocol(*vconnp, f, &cur_protocol)) { + return f; + } } + + usable_s = ofputil_protocols_to_string(usable_protocols); + ovs_fatal(0, "switch does not support any of the usable flow " + "formats (%s)", usable_s); } static void -do_flow_mod_file__(int argc OVS_UNUSED, char *argv[], uint16_t command) +ofctl_flow_mod__(const char *remote, struct ofputil_flow_mod *fms, + size_t n_fms, enum ofputil_protocol usable_protocols) { - enum nx_flow_format flow_format; - bool flow_mod_table_id; - struct list requests; + enum ofputil_protocol protocol; struct vconn *vconn; - FILE *file; + size_t i; - file = !strcmp(argv[2], "-") ? stdin : fopen(argv[2], "r"); - if (file == NULL) { - ovs_fatal(errno, "%s: open", argv[2]); - } + protocol = open_vconn_for_flow_mod(remote, &vconn, usable_protocols); - list_init(&requests); - flow_format = set_initial_format_for_flow_mod(&requests); - flow_mod_table_id = false; + for (i = 0; i < n_fms; i++) { + struct ofputil_flow_mod *fm = &fms[i]; - open_vconn(argv[1], &vconn); - while (parse_ofp_flow_mod_file(&requests, &flow_format, &flow_mod_table_id, - file, command)) { - check_final_format_for_flow_mod(flow_format); - transact_multiple_noreply(vconn, &requests); + transact_noreply(vconn, ofputil_encode_flow_mod(fm, protocol)); + free(CONST_CAST(struct ofpact *, fm->ofpacts)); } vconn_close(vconn); +} - if (file != stdin) { - fclose(file); +static void +ofctl_flow_mod_file(int argc OVS_UNUSED, char *argv[], uint16_t command) +{ + 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[2], command, &fms, &n_fms, + &usable_protocols); + if (error) { + ovs_fatal(0, "%s", error); } + ofctl_flow_mod__(argv[1], fms, n_fms, usable_protocols); + free(fms); } static void -do_flow_mod__(int argc, char *argv[], uint16_t command) +ofctl_flow_mod(int argc, char *argv[], uint16_t command) { - enum nx_flow_format flow_format; - bool flow_mod_table_id; - struct list requests; - struct vconn *vconn; - if (argc > 2 && !strcmp(argv[2], "-")) { - do_flow_mod_file__(argc, argv, command); - return; - } - - list_init(&requests); - flow_format = set_initial_format_for_flow_mod(&requests); - flow_mod_table_id = false; - - parse_ofp_flow_mod_str(&requests, &flow_format, &flow_mod_table_id, - argc > 2 ? argv[2] : "", command, false); - check_final_format_for_flow_mod(flow_format); + ofctl_flow_mod_file(argc, argv, command); + } else { + struct ofputil_flow_mod fm; + char *error; + enum ofputil_protocol usable_protocols; - open_vconn(argv[1], &vconn); - transact_multiple_noreply(vconn, &requests); - vconn_close(vconn); + error = parse_ofp_flow_mod_str(&fm, argc > 2 ? argv[2] : "", command, + &usable_protocols); + if (error) { + ovs_fatal(0, "%s", error); + } + ofctl_flow_mod__(argv[1], &fm, 1, usable_protocols); + } } static void -do_add_flow(int argc, char *argv[]) +ofctl_add_flow(int argc, char *argv[]) { - do_flow_mod__(argc, argv, OFPFC_ADD); + ofctl_flow_mod(argc, argv, OFPFC_ADD); } static void -do_add_flows(int argc, char *argv[]) +ofctl_add_flows(int argc, char *argv[]) { - do_flow_mod_file__(argc, argv, OFPFC_ADD); + ofctl_flow_mod_file(argc, argv, OFPFC_ADD); } static void -do_mod_flows(int argc, char *argv[]) +ofctl_mod_flows(int argc, char *argv[]) { - do_flow_mod__(argc, argv, strict ? OFPFC_MODIFY_STRICT : OFPFC_MODIFY); + ofctl_flow_mod(argc, argv, strict ? OFPFC_MODIFY_STRICT : OFPFC_MODIFY); } static void -do_del_flows(int argc, char *argv[]) +ofctl_del_flows(int argc, char *argv[]) { - do_flow_mod__(argc, argv, strict ? OFPFC_DELETE_STRICT : OFPFC_DELETE); + ofctl_flow_mod(argc, argv, strict ? OFPFC_DELETE_STRICT : OFPFC_DELETE); } static void set_packet_in_format(struct vconn *vconn, enum nx_packet_in_format packet_in_format) { - struct ofpbuf *spif = ofputil_make_set_packet_in_format(packet_in_format); + struct ofpbuf *spif; + + spif = ofputil_make_set_packet_in_format(vconn_get_version(vconn), + packet_in_format); transact_noreply(vconn, spif); VLOG_DBG("%s: using user-specified packet in format %s", vconn_get_name(vconn), @@ -823,27 +1261,188 @@ monitor_set_invalid_ttl_to_controller(struct vconn *vconn) return 0; } +/* Converts hex digits in 'hex' to an OpenFlow message in '*msgp'. The + * caller must free '*msgp'. On success, returns NULL. On failure, returns + * an error message and stores NULL in '*msgp'. */ +static const char * +openflow_from_hex(const char *hex, struct ofpbuf **msgp) +{ + struct ofp_header *oh; + struct ofpbuf *msg; + + msg = ofpbuf_new(strlen(hex) / 2); + *msgp = NULL; + + if (ofpbuf_put_hex(msg, hex, NULL)[0] != '\0') { + ofpbuf_delete(msg); + return "Trailing garbage in hex data"; + } + + if (ofpbuf_size(msg) < sizeof(struct ofp_header)) { + ofpbuf_delete(msg); + return "Message too short for OpenFlow"; + } + + oh = ofpbuf_data(msg); + if (ofpbuf_size(msg) != ntohs(oh->length)) { + ofpbuf_delete(msg); + return "Message size does not match length in OpenFlow header"; + } + + *msgp = msg; + return NULL; +} + +static void +ofctl_send(struct unixctl_conn *conn, int argc, + const char *argv[], void *vconn_) +{ + struct vconn *vconn = vconn_; + struct ds reply; + bool ok; + int i; + + ok = true; + ds_init(&reply); + for (i = 1; i < argc; i++) { + const char *error_msg; + struct ofpbuf *msg; + int error; + + error_msg = openflow_from_hex(argv[i], &msg); + if (error_msg) { + ds_put_format(&reply, "%s\n", error_msg); + ok = false; + continue; + } + + fprintf(stderr, "send: "); + ofp_print(stderr, ofpbuf_data(msg), ofpbuf_size(msg), verbosity); + + error = vconn_send_block(vconn, msg); + if (error) { + ofpbuf_delete(msg); + ds_put_format(&reply, "%s\n", ovs_strerror(error)); + ok = false; + } else { + ds_put_cstr(&reply, "sent\n"); + } + } + + if (ok) { + unixctl_command_reply(conn, ds_cstr(&reply)); + } else { + unixctl_command_reply_error(conn, ds_cstr(&reply)); + } + ds_destroy(&reply); +} + +struct barrier_aux { + struct vconn *vconn; /* OpenFlow connection for sending barrier. */ + struct unixctl_conn *conn; /* Connection waiting for barrier response. */ +}; + +static void +ofctl_barrier(struct unixctl_conn *conn, int argc OVS_UNUSED, + const char *argv[] OVS_UNUSED, void *aux_) +{ + struct barrier_aux *aux = aux_; + struct ofpbuf *msg; + int error; + + if (aux->conn) { + unixctl_command_reply_error(conn, "already waiting for barrier reply"); + return; + } + + msg = ofputil_encode_barrier_request(vconn_get_version(aux->vconn)); + error = vconn_send_block(aux->vconn, msg); + if (error) { + ofpbuf_delete(msg); + unixctl_command_reply_error(conn, ovs_strerror(error)); + } else { + aux->conn = conn; + } +} + +static void +ofctl_set_output_file(struct unixctl_conn *conn, int argc OVS_UNUSED, + const char *argv[], void *aux OVS_UNUSED) +{ + int fd; + + fd = open(argv[1], O_CREAT | O_TRUNC | O_WRONLY, 0666); + if (fd < 0) { + unixctl_command_reply_error(conn, ovs_strerror(errno)); + return; + } + + fflush(stderr); + dup2(fd, STDERR_FILENO); + close(fd); + unixctl_command_reply(conn, NULL); +} + +static void +ofctl_block(struct unixctl_conn *conn, int argc OVS_UNUSED, + const char *argv[] OVS_UNUSED, void *blocked_) +{ + bool *blocked = blocked_; + + if (!*blocked) { + *blocked = true; + unixctl_command_reply(conn, NULL); + } else { + unixctl_command_reply(conn, "already blocking"); + } +} + +static void +ofctl_unblock(struct unixctl_conn *conn, int argc OVS_UNUSED, + const char *argv[] OVS_UNUSED, void *blocked_) +{ + bool *blocked = blocked_; + + if (*blocked) { + *blocked = false; + unixctl_command_reply(conn, NULL); + } else { + unixctl_command_reply(conn, "already unblocked"); + } +} + +/* Prints to stdout all of the messages received on 'vconn'. + * + * Iff 'reply_to_echo_requests' is true, sends a reply to any echo request + * received on 'vconn'. */ static void -monitor_vconn(struct vconn *vconn) +monitor_vconn(struct vconn *vconn, bool reply_to_echo_requests) { + struct barrier_aux barrier_aux = { vconn, NULL }; struct unixctl_server *server; bool exiting = false; - int error, fd; - - /* Daemonization will close stderr but we really want to keep it, so make a - * copy. */ - fd = dup(STDERR_FILENO); + bool blocked = false; + int error; + daemon_save_fd(STDERR_FILENO); daemonize_start(); error = unixctl_server_create(NULL, &server); if (error) { ovs_fatal(error, "failed to create unixctl server"); } unixctl_command_register("exit", "", 0, 0, ofctl_exit, &exiting); - daemonize_complete(); + unixctl_command_register("ofctl/send", "OFMSG...", 1, INT_MAX, + ofctl_send, vconn); + unixctl_command_register("ofctl/barrier", "", 0, 0, + ofctl_barrier, &barrier_aux); + unixctl_command_register("ofctl/set-output-file", "FILE", 1, 1, + ofctl_set_output_file, NULL); - /* Now get stderr back. */ - dup2(fd, STDERR_FILENO); + unixctl_command_register("ofctl/block", "", 0, 0, ofctl_block, &blocked); + unixctl_command_register("ofctl/unblock", "", 0, 0, ofctl_unblock, + &blocked); + + daemonize_complete(); for (;;) { struct ofpbuf *b; @@ -851,14 +1450,45 @@ monitor_vconn(struct vconn *vconn) unixctl_server_run(server); - for (;;) { + while (!blocked) { + enum ofptype type; + retval = vconn_recv(vconn, &b); if (retval == EAGAIN) { break; } - run(retval, "vconn_recv"); - ofp_print(stderr, b->data, b->size, verbosity + 2); + + if (timestamp) { + char *s = xastrftime_msec("%Y-%m-%d %H:%M:%S.###: ", + time_wall_msec(), true); + fputs(s, stderr); + free(s); + } + + ofptype_decode(&type, ofpbuf_data(b)); + ofp_print(stderr, ofpbuf_data(b), ofpbuf_size(b), verbosity + 2); + + switch ((int) type) { + case OFPTYPE_BARRIER_REPLY: + if (barrier_aux.conn) { + unixctl_command_reply(barrier_aux.conn, NULL); + barrier_aux.conn = NULL; + } + break; + + case OFPTYPE_ECHO_REQUEST: + if (reply_to_echo_requests) { + struct ofpbuf *reply; + + reply = make_echo_reply(ofpbuf_data(b)); + retval = vconn_send_block(vconn, reply); + if (retval) { + ovs_fatal(retval, "failed to send echo reply"); + } + } + break; + } ofpbuf_delete(b); } @@ -868,84 +1498,130 @@ monitor_vconn(struct vconn *vconn) vconn_run(vconn); vconn_run_wait(vconn); - vconn_recv_wait(vconn); + if (!blocked) { + vconn_recv_wait(vconn); + } unixctl_server_wait(server); poll_block(); } + vconn_close(vconn); + unixctl_server_destroy(server); } static void -do_monitor(int argc, char *argv[]) +ofctl_monitor(int argc, char *argv[]) { struct vconn *vconn; + int i; + enum ofputil_protocol usable_protocols; open_vconn(argv[1], &vconn); - if (argc > 2) { - struct ofp_switch_config config; + for (i = 2; i < argc; i++) { + const char *arg = argv[i]; - fetch_switch_config(vconn, &config); - config.miss_send_len = htons(atoi(argv[2])); - set_switch_config(vconn, &config); - } - if (argc > 3) { - if (!strcmp(argv[3], "invalid_ttl")) { + if (isdigit((unsigned char) *arg)) { + struct ofp_switch_config config; + + fetch_switch_config(vconn, &config); + config.miss_send_len = htons(atoi(arg)); + set_switch_config(vconn, &config); + } else if (!strcmp(arg, "invalid_ttl")) { monitor_set_invalid_ttl_to_controller(vconn); + } else if (!strncmp(arg, "watch:", 6)) { + struct ofputil_flow_monitor_request fmr; + struct ofpbuf *msg; + char *error; + + error = parse_flow_monitor_request(&fmr, arg + 6, + &usable_protocols); + if (error) { + ovs_fatal(0, "%s", error); + } + + msg = ofpbuf_new(0); + ofputil_append_flow_monitor_request(&fmr, msg); + dump_stats_transaction(vconn, msg); + } else { + ovs_fatal(0, "%s: unsupported \"monitor\" argument", arg); } } + if (preferred_packet_in_format >= 0) { set_packet_in_format(vconn, preferred_packet_in_format); } else { - struct ofpbuf *spif, *reply; - - spif = ofputil_make_set_packet_in_format(NXPIF_NXM); - run(vconn_transact_noreply(vconn, spif, &reply), - "talking to %s", vconn_get_name(vconn)); - if (reply) { - char *s = ofp_to_string(reply->data, reply->size, 2); - VLOG_DBG("%s: failed to set packet in format to nxm, controller" - " replied: %s. Falling back to the switch default.", - vconn_get_name(vconn), s); - free(s); - ofpbuf_delete(reply); + enum ofp_version version = vconn_get_version(vconn); + + switch (version) { + case OFP10_VERSION: { + struct ofpbuf *spif, *reply; + + spif = ofputil_make_set_packet_in_format(vconn_get_version(vconn), + NXPIF_NXM); + run(vconn_transact_noreply(vconn, spif, &reply), + "talking to %s", vconn_get_name(vconn)); + if (reply) { + char *s = ofp_to_string(ofpbuf_data(reply), ofpbuf_size(reply), 2); + VLOG_DBG("%s: failed to set packet in format to nxm, controller" + " replied: %s. Falling back to the switch default.", + vconn_get_name(vconn), s); + free(s); + ofpbuf_delete(reply); + } + break; + } + case OFP11_VERSION: + case OFP12_VERSION: + case OFP13_VERSION: + case OFP14_VERSION: + break; + default: + OVS_NOT_REACHED(); } } - monitor_vconn(vconn); + monitor_vconn(vconn, true); } static void -do_snoop(int argc OVS_UNUSED, char *argv[]) +ofctl_snoop(int argc OVS_UNUSED, char *argv[]) { struct vconn *vconn; - open_vconn__(argv[1], "snoop", &vconn); - monitor_vconn(vconn); + open_vconn__(argv[1], SNOOP, &vconn); + monitor_vconn(vconn, false); } static void -do_dump_ports(int argc, char *argv[]) +ofctl_dump_ports(int argc, char *argv[]) { - struct ofp_port_stats_request *req; struct ofpbuf *request; - uint16_t port; + 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; + request = ofputil_encode_dump_ports_request(vconn_get_version(vconn), port); + dump_stats_transaction(vconn, request); + vconn_close(vconn); +} - req = alloc_stats_request(sizeof *req, OFPST_PORT, &request); - port = argc > 2 ? str_to_port_no(argv[1], argv[2]) : OFPP_NONE; - req->port_no = htons(port); - dump_stats_transaction(argv[1], request); +static void +ofctl_dump_ports_desc(int argc OVS_UNUSED, char *argv[]) +{ + dump_trivial_stats_transaction(argv[1], OFPRAW_OFPST_PORT_DESC_REQUEST); } static void -do_probe(int argc OVS_UNUSED, char *argv[]) +ofctl_probe(int argc OVS_UNUSED, char *argv[]) { struct ofpbuf *request; struct vconn *vconn; struct ofpbuf *reply; - make_openflow(sizeof(struct ofp_header), OFPT_ECHO_REQUEST, &request); open_vconn(argv[1], &vconn); + request = make_echo_request(vconn_get_version(vconn)); run(vconn_transact(vconn, request, &reply), "talking to %s", argv[1]); - if (reply->size != sizeof(struct ofp_header)) { + if (ofpbuf_size(reply) != sizeof(struct ofp_header)) { ovs_fatal(0, "reply does not match request"); } ofpbuf_delete(reply); @@ -953,48 +1629,145 @@ do_probe(int argc OVS_UNUSED, char *argv[]) } static void -do_mod_port(int argc OVS_UNUSED, char *argv[]) +ofctl_packet_out(int argc, char *argv[]) { - struct ofp_port_mod *opm; - struct ofp_phy_port opp; - struct ofpbuf *request; + enum ofputil_protocol protocol; + struct ofputil_packet_out po; + struct ofpbuf ofpacts; struct vconn *vconn; + char *error; + int i; + enum ofputil_protocol usable_protocols; /* XXX: Use in proto selection */ + + ofpbuf_init(&ofpacts, 64); + error = parse_ofpacts(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.ofpacts = ofpbuf_data(&ofpacts); + po.ofpacts_len = ofpbuf_size(&ofpacts); + + protocol = open_vconn(argv[1], &vconn); + for (i = 4; i < argc; i++) { + struct ofpbuf *packet, *opo; + const char *error_msg; + + error_msg = eth_from_hex(argv[i], &packet); + if (error_msg) { + ovs_fatal(0, "%s", error_msg); + } - fetch_ofp_phy_port(argv[1], argv[2], &opp); - - opm = make_openflow(sizeof(struct ofp_port_mod), OFPT_PORT_MOD, &request); - opm->port_no = opp.port_no; - memcpy(opm->hw_addr, opp.hw_addr, sizeof opm->hw_addr); - opm->config = htonl(0); - opm->mask = htonl(0); - opm->advertise = htonl(0); - - if (!strcasecmp(argv[3], "up")) { - opm->mask |= htonl(OFPPC_PORT_DOWN); - } else if (!strcasecmp(argv[3], "down")) { - opm->mask |= htonl(OFPPC_PORT_DOWN); - opm->config |= htonl(OFPPC_PORT_DOWN); - } else if (!strcasecmp(argv[3], "flood")) { - opm->mask |= htonl(OFPPC_NO_FLOOD); - } else if (!strcasecmp(argv[3], "noflood")) { - opm->mask |= htonl(OFPPC_NO_FLOOD); - opm->config |= htonl(OFPPC_NO_FLOOD); - } else if (!strcasecmp(argv[3], "forward")) { - opm->mask |= htonl(OFPPC_NO_FWD); - } else if (!strcasecmp(argv[3], "noforward")) { - opm->mask |= htonl(OFPPC_NO_FWD); - opm->config |= htonl(OFPPC_NO_FWD); + po.packet = ofpbuf_data(packet); + po.packet_len = ofpbuf_size(packet); + opo = ofputil_encode_packet_out(&po, protocol); + transact_noreply(vconn, opo); + ofpbuf_delete(packet); + } + vconn_close(vconn); + ofpbuf_uninit(&ofpacts); +} + +static void +ofctl_mod_port(int argc OVS_UNUSED, char *argv[]) +{ + struct ofp_config_flag { + const char *name; /* The flag's name. */ + enum ofputil_port_config bit; /* Bit to turn on or off. */ + bool on; /* Value to set the bit to. */ + }; + static const struct ofp_config_flag flags[] = { + { "up", OFPUTIL_PC_PORT_DOWN, false }, + { "down", OFPUTIL_PC_PORT_DOWN, true }, + { "stp", OFPUTIL_PC_NO_STP, false }, + { "receive", OFPUTIL_PC_NO_RECV, false }, + { "receive-stp", OFPUTIL_PC_NO_RECV_STP, false }, + { "flood", OFPUTIL_PC_NO_FLOOD, false }, + { "forward", OFPUTIL_PC_NO_FWD, false }, + { "packet-in", OFPUTIL_PC_NO_PACKET_IN, false }, + }; + + const struct ofp_config_flag *flag; + enum ofputil_protocol protocol; + struct ofputil_port_mod pm; + struct ofputil_phy_port pp; + struct vconn *vconn; + const char *command; + bool not; + + fetch_ofputil_phy_port(argv[1], argv[2], &pp); + + pm.port_no = pp.port_no; + memcpy(pm.hw_addr, pp.hw_addr, ETH_ADDR_LEN); + pm.config = 0; + pm.mask = 0; + pm.advertise = 0; + + if (!strncasecmp(argv[3], "no-", 3)) { + command = argv[3] + 3; + not = true; + } else if (!strncasecmp(argv[3], "no", 2)) { + command = argv[3] + 2; + not = true; } else { - ovs_fatal(0, "unknown mod-port command '%s'", argv[3]); + command = argv[3]; + not = false; + } + for (flag = flags; flag < &flags[ARRAY_SIZE(flags)]; flag++) { + if (!strcasecmp(command, flag->name)) { + pm.mask = flag->bit; + pm.config = flag->on ^ not ? flag->bit : 0; + goto found; + } } + ovs_fatal(0, "unknown mod-port command '%s'", argv[3]); - open_vconn(argv[1], &vconn); - transact_noreply(vconn, request); +found: + protocol = open_vconn(argv[1], &vconn); + transact_noreply(vconn, ofputil_encode_port_mod(&pm, protocol)); + vconn_close(vconn); +} + +static void +ofctl_mod_table(int argc OVS_UNUSED, char *argv[]) +{ + enum ofputil_protocol protocol, usable_protocols; + struct ofputil_table_mod tm; + struct vconn *vconn; + char *error; + int i; + + error = parse_ofp_table_mod(&tm, argv[2], argv[3], &usable_protocols); + if (error) { + ovs_fatal(0, "%s", error); + } + + protocol = open_vconn(argv[1], &vconn); + if (!(protocol & usable_protocols)) { + for (i = 0; i < sizeof(enum ofputil_protocol) * CHAR_BIT; i++) { + enum ofputil_protocol f = 1 << i; + if (f != protocol + && f & usable_protocols + && try_set_protocol(vconn, f, &protocol)) { + protocol = f; + break; + } + } + } + + if (!(protocol & usable_protocols)) { + char *usable_s = ofputil_protocols_to_string(usable_protocols); + ovs_fatal(0, "Switch does not support table mod message(%s)", usable_s); + } + + transact_noreply(vconn, ofputil_encode_table_mod(&tm, protocol)); vconn_close(vconn); } static void -do_get_frags(int argc OVS_UNUSED, char *argv[]) +ofctl_get_frags(int argc OVS_UNUSED, char *argv[]) { struct ofp_switch_config config; struct vconn *vconn; @@ -1006,7 +1779,7 @@ do_get_frags(int argc OVS_UNUSED, char *argv[]) } static void -do_set_frags(int argc OVS_UNUSED, char *argv[]) +ofctl_set_frags(int argc OVS_UNUSED, char *argv[]) { struct ofp_switch_config config; enum ofp_config_flags mode; @@ -1039,7 +1812,145 @@ do_set_frags(int argc OVS_UNUSED, char *argv[]) } static void -do_ping(int argc, char *argv[]) +ofctl_ofp_parse(int argc OVS_UNUSED, char *argv[]) +{ + const char *filename = argv[1]; + struct ofpbuf b; + FILE *file; + + file = !strcmp(filename, "-") ? stdin : fopen(filename, "r"); + if (file == NULL) { + ovs_fatal(errno, "%s: open", filename); + } + + ofpbuf_init(&b, 65536); + for (;;) { + struct ofp_header *oh; + size_t length, tail_len; + void *tail; + size_t n; + + ofpbuf_clear(&b); + oh = ofpbuf_put_uninit(&b, sizeof *oh); + n = fread(oh, 1, sizeof *oh, file); + if (n == 0) { + break; + } else if (n < sizeof *oh) { + ovs_fatal(0, "%s: unexpected end of file mid-message", filename); + } + + length = ntohs(oh->length); + if (length < sizeof *oh) { + ovs_fatal(0, "%s: %"PRIuSIZE"-byte message is too short for OpenFlow", + filename, length); + } + + tail_len = length - sizeof *oh; + tail = ofpbuf_put_uninit(&b, tail_len); + n = fread(tail, 1, tail_len, file); + if (n < tail_len) { + ovs_fatal(0, "%s: unexpected end of file mid-message", filename); + } + + ofp_print(stdout, ofpbuf_data(&b), ofpbuf_size(&b), verbosity + 2); + } + ofpbuf_uninit(&b); + + if (file != stdin) { + fclose(file); + } +} + +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(int argc OVS_UNUSED, char *argv[]) +{ + struct tcp_reader *reader; + FILE *file; + int error; + bool first; + + file = ovs_pcap_open(argv[1], "rb"); + if (!file) { + ovs_fatal(errno, "%s: open failed", argv[1]); + } + + reader = tcp_reader_open(); + first = true; + for (;;) { + struct ofpbuf *packet; + long long int when; + struct flow flow; + const struct pkt_metadata md = PKT_METADATA_INITIALIZER(ODPP_NONE); + + error = ovs_pcap_read(file, &packet, &when); + if (error) { + break; + } + flow_extract(packet, &md, &flow); + if (flow.dl_type == htons(ETH_TYPE_IP) + && flow.nw_proto == IPPROTO_TCP + && (is_openflow_port(flow.tp_src, argv + 2) || + is_openflow_port(flow.tp_dst, argv + 2))) { + struct ofpbuf *payload = tcp_reader_run(reader, &flow, packet); + if (payload) { + while (ofpbuf_size(payload) >= sizeof(struct ofp_header)) { + const struct ofp_header *oh; + void *data = ofpbuf_data(payload); + int length; + + /* Align OpenFlow on 8-byte boundary for safe access. */ + ofpbuf_shift(payload, -((intptr_t) data & 7)); + + oh = ofpbuf_data(payload); + length = ntohs(oh->length); + if (ofpbuf_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, ofpbuf_data(payload), length, verbosity + 1); + ofpbuf_pull(payload, length); + } + } + } + ofpbuf_delete(packet); + } + tcp_reader_close(reader); +} + +static void +ofctl_ping(int argc, char *argv[]) { size_t max_payload = 65535 - sizeof(struct ofp_header); unsigned int payload; @@ -1048,35 +1959,36 @@ do_ping(int argc, char *argv[]) payload = argc > 2 ? atoi(argv[2]) : 64; if (payload > max_payload) { - ovs_fatal(0, "payload must be between 0 and %zu bytes", max_payload); + ovs_fatal(0, "payload must be between 0 and %"PRIuSIZE" bytes", max_payload); } open_vconn(argv[1], &vconn); for (i = 0; i < 10; i++) { struct timeval start, end; struct ofpbuf *request, *reply; - struct ofp_header *rq_hdr, *rpy_hdr; + const struct ofp_header *rpy_hdr; + enum ofptype type; - rq_hdr = make_openflow(sizeof(struct ofp_header) + payload, - OFPT_ECHO_REQUEST, &request); - random_bytes(rq_hdr + 1, payload); + request = ofpraw_alloc(OFPRAW_OFPT_ECHO_REQUEST, + vconn_get_version(vconn), payload); + random_bytes(ofpbuf_put_uninit(request, payload), payload); xgettimeofday(&start); run(vconn_transact(vconn, ofpbuf_clone(request), &reply), "transact"); xgettimeofday(&end); - rpy_hdr = reply->data; - if (reply->size != request->size - || memcmp(rpy_hdr + 1, rq_hdr + 1, payload) - || rpy_hdr->xid != rq_hdr->xid - || rpy_hdr->type != OFPT_ECHO_REPLY) { + rpy_hdr = ofpbuf_data(reply); + if (ofptype_pull(&type, reply) + || type != OFPTYPE_ECHO_REPLY + || ofpbuf_size(reply) != payload + || memcmp(ofpbuf_l3(request), ofpbuf_l3(reply), payload)) { printf("Reply does not match request. Request:\n"); - ofp_print(stdout, request, request->size, verbosity + 2); + ofp_print(stdout, request, ofpbuf_size(request), verbosity + 2); printf("Reply:\n"); - ofp_print(stdout, reply, reply->size, verbosity + 2); + ofp_print(stdout, reply, ofpbuf_size(reply), verbosity + 2); } - printf("%zu bytes from %s: xid=%08"PRIx32" time=%.1f ms\n", - reply->size - sizeof *rpy_hdr, argv[1], ntohl(rpy_hdr->xid), + printf("%"PRIu32" bytes from %s: xid=%08"PRIx32" time=%.1f ms\n", + ofpbuf_size(reply), argv[1], ntohl(rpy_hdr->xid), (1000*(double)(end.tv_sec - start.tv_sec)) + (.001*(end.tv_usec - start.tv_usec))); ofpbuf_delete(request); @@ -1086,7 +1998,7 @@ do_ping(int argc, char *argv[]) } static void -do_benchmark(int argc OVS_UNUSED, char *argv[]) +ofctl_benchmark(int argc OVS_UNUSED, char *argv[]) { size_t max_payload = 65535 - sizeof(struct ofp_header); struct timeval start, end; @@ -1098,7 +2010,7 @@ do_benchmark(int argc OVS_UNUSED, char *argv[]) payload_size = atoi(argv[2]); if (payload_size > max_payload) { - ovs_fatal(0, "payload must be between 0 and %zu bytes", max_payload); + ovs_fatal(0, "payload must be between 0 and %"PRIuSIZE" bytes", max_payload); } message_size = sizeof(struct ofp_header) + payload_size; @@ -1111,10 +2023,10 @@ do_benchmark(int argc OVS_UNUSED, char *argv[]) xgettimeofday(&start); for (i = 0; i < count; i++) { struct ofpbuf *request, *reply; - struct ofp_header *rq_hdr; - rq_hdr = make_openflow(message_size, OFPT_ECHO_REQUEST, &request); - memset(rq_hdr + 1, 0, payload_size); + request = ofpraw_alloc(OFPRAW_OFPT_ECHO_REQUEST, + vconn_get_version(vconn), payload_size); + ofpbuf_put_zeros(request, payload_size); run(vconn_transact(vconn, request, &reply), "transact"); ofpbuf_delete(reply); } @@ -1129,35 +2041,182 @@ do_benchmark(int argc OVS_UNUSED, char *argv[]) } static void -do_help(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) +ofctl_group_mod__(const char *remote, struct ofputil_group_mod *gms, + size_t n_gms) { - usage(); -} - -/* replace-flows and diff-flows commands. */ + struct ofputil_group_mod *gm; + struct ofpbuf *request; -/* A flow table entry, possibly with two different versions. */ -struct fte { - struct cls_rule rule; /* Within a "struct classifier". */ - struct fte_version *versions[2]; -}; + struct vconn *vconn; + size_t i; -/* One version of a Flow Table Entry. */ -struct fte_version { - ovs_be64 cookie; - uint16_t idle_timeout; - uint16_t hard_timeout; - uint16_t flags; - union ofp_action *actions; - size_t n_actions; -}; + open_vconn(remote, &vconn); -/* Frees 'version' and the data that it owns. */ -static void -fte_version_free(struct fte_version *version) -{ + for (i = 0; i < n_gms; i++) { + gm = &gms[i]; + request = ofputil_encode_group_mod(vconn_get_version(vconn), gm); + if (request) { + transact_noreply(vconn, request); + } + } + + vconn_close(vconn); + +} + + +static void +ofctl_group_mod_file(int argc OVS_UNUSED, char *argv[], uint16_t command) +{ + struct ofputil_group_mod *gms = NULL; + enum ofputil_protocol usable_protocols; + size_t n_gms = 0; + char *error; + + 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); + free(gms); +} + +static void +ofctl_group_mod(int argc, char *argv[], uint16_t command) +{ + if (argc > 2 && !strcmp(argv[2], "-")) { + ofctl_group_mod_file(argc, argv, command); + } else { + enum ofputil_protocol usable_protocols; + struct ofputil_group_mod gm; + char *error; + + error = parse_ofp_group_mod_str(&gm, command, argc > 2 ? argv[2] : "", + &usable_protocols); + if (error) { + ovs_fatal(0, "%s", error); + } + ofctl_group_mod__(argv[1], &gm, 1); + } +} + +static void +ofctl_add_group(int argc, char *argv[]) +{ + ofctl_group_mod(argc, argv, OFPGC11_ADD); +} + +static void +ofctl_add_groups(int argc, char *argv[]) +{ + ofctl_group_mod_file(argc, argv, OFPGC11_ADD); +} + +static void +ofctl_mod_group(int argc, char *argv[]) +{ + ofctl_group_mod(argc, argv, OFPGC11_MODIFY); +} + +static void +ofctl_del_groups(int argc, char *argv[]) +{ + ofctl_group_mod(argc, argv, OFPGC11_DELETE); +} + +static void +ofctl_dump_group_stats(int argc, char *argv[]) +{ + enum ofputil_protocol usable_protocols; + struct ofputil_group_mod gm; + struct ofpbuf *request; + struct vconn *vconn; + uint32_t group_id; + char *error; + + memset(&gm, 0, sizeof gm); + + error = parse_ofp_group_mod_str(&gm, OFPGC11_DELETE, + argc > 2 ? argv[2] : "", + &usable_protocols); + if (error) { + ovs_fatal(0, "%s", error); + } + + group_id = gm.group_id; + + open_vconn(argv[1], &vconn); + request = ofputil_encode_group_stats_request(vconn_get_version(vconn), + group_id); + if (request) { + dump_stats_transaction(vconn, request); + } + + vconn_close(vconn); +} + +static void +ofctl_dump_group_desc(int argc OVS_UNUSED, char *argv[]) +{ + struct ofpbuf *request; + struct vconn *vconn; + + open_vconn(argv[1], &vconn); + + request = ofputil_encode_group_desc_request(vconn_get_version(vconn)); + if (request) { + dump_stats_transaction(vconn, request); + } + + vconn_close(vconn); +} + +static void +ofctl_dump_group_features(int argc OVS_UNUSED, char *argv[]) +{ + struct ofpbuf *request; + struct vconn *vconn; + + open_vconn(argv[1], &vconn); + request = ofputil_encode_group_features_request(vconn_get_version(vconn)); + if (request) { + dump_stats_transaction(vconn, request); + } + + vconn_close(vconn); +} + +static void +ofctl_help(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) +{ + usage(); +} + +/* replace-flows and diff-flows commands. */ + +/* A flow table entry, possibly with two different versions. */ +struct fte { + struct cls_rule rule; /* Within a "struct classifier". */ + struct fte_version *versions[2]; +}; + +/* One version of a Flow Table Entry. */ +struct fte_version { + ovs_be64 cookie; + uint16_t idle_timeout; + uint16_t hard_timeout; + uint16_t flags; + struct ofpact *ofpacts; + size_t ofpacts_len; +}; + +/* Frees 'version' and the data that it owns. */ +static void +fte_version_free(struct fte_version *version) +{ if (version) { - free(version->actions); + free(CONST_CAST(struct ofpact *, version->ofpacts)); free(version); } } @@ -1172,32 +2231,37 @@ 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->n_actions == b->n_actions - && !memcmp(a->actions, b->actions, - a->n_actions * sizeof *a->actions)); + && ofpacts_equal(a->ofpacts, a->ofpacts_len, + b->ofpacts, b->ofpacts_len)); } -/* Prints 'version' on stdout. Expects the caller to have printed the rule - * associated with the version. */ +/* Clears 's', then if 's' has a version 'index', formats 'fte' and version + * 'index' into 's', followed by a new-line. */ static void -fte_version_print(const struct fte_version *version) +fte_version_format(const struct fte *fte, int index, struct ds *s) { - struct ds s; + const struct fte_version *version = fte->versions[index]; + + ds_clear(s); + if (!version) { + return; + } + cls_rule_format(&fte->rule, s); if (version->cookie != htonll(0)) { - printf(" cookie=0x%"PRIx64, ntohll(version->cookie)); + ds_put_format(s, " cookie=0x%"PRIx64, ntohll(version->cookie)); } if (version->idle_timeout != OFP_FLOW_PERMANENT) { - printf(" idle_timeout=%"PRIu16, version->idle_timeout); + ds_put_format(s, " idle_timeout=%"PRIu16, version->idle_timeout); } if (version->hard_timeout != OFP_FLOW_PERMANENT) { - printf(" hard_timeout=%"PRIu16, version->hard_timeout); + ds_put_format(s, " hard_timeout=%"PRIu16, version->hard_timeout); } - ds_init(&s); - ofp_print_actions(&s, version->actions, version->n_actions); - printf(" %s\n", ds_cstr(&s)); - ds_destroy(&s); + ds_put_cstr(s, " actions="); + ofpacts_format(version->ofpacts, version->ofpacts_len, s); + + ds_put_char(s, '\n'); } static struct fte * @@ -1213,6 +2277,7 @@ fte_free(struct fte *fte) if (fte) { fte_version_free(fte->versions[0]); fte_version_free(fte->versions[1]); + cls_rule_destroy(&fte->rule); free(fte); } } @@ -1224,11 +2289,14 @@ fte_free_all(struct classifier *cls) struct cls_cursor cursor; struct fte *fte, *next; + fat_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); } + fat_rwlock_unlock(&cls->rwlock); + classifier_destroy(cls); } /* Searches 'cls' for an FTE matching 'rule', inserting a new one if @@ -1237,30 +2305,34 @@ fte_free_all(struct classifier *cls) * * Takes ownership of 'version'. */ static void -fte_insert(struct classifier *cls, const struct cls_rule *rule, - struct fte_version *version, int index) +fte_insert(struct classifier *cls, const struct match *match, + unsigned int priority, struct fte_version *version, int index) { struct fte *old, *fte; fte = xzalloc(sizeof *fte); - fte->rule = *rule; + cls_rule_init(&fte->rule, match, priority); fte->versions[index] = version; + fat_rwlock_wrlock(&cls->rwlock); old = fte_from_cls_rule(classifier_replace(cls, &fte->rule)); + fat_rwlock_unlock(&cls->rwlock); if (old) { fte_version_free(old->versions[index]); fte->versions[!index] = old->versions[!index]; + cls_rule_destroy(&old->rule); free(old); } } /* Reads the flows in 'filename' as flow table entries in 'cls' for the version - * with the specified 'index'. Returns the minimum flow format required to - * represent the flows that were read. */ -static enum nx_flow_format + * 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) { - enum nx_flow_format min_flow_format; + enum ofputil_protocol usable_protocols; + int line_number; struct ds s; FILE *file; @@ -1270,27 +2342,30 @@ read_flows_from_file(const char *filename, struct classifier *cls, int index) } ds_init(&s); - min_flow_format = NXFF_OPENFLOW10; - while (!ds_get_preprocessed_line(&s, file)) { + usable_protocols = OFPUTIL_P_ANY; + line_number = 0; + while (!ds_get_preprocessed_line(&s, file, &line_number)) { struct fte_version *version; struct ofputil_flow_mod fm; - enum nx_flow_format min_ff; + char *error; + enum ofputil_protocol usable; - parse_ofp_str(&fm, OFPFC_ADD, ds_cstr(&s), true); + error = parse_ofp_str(&fm, OFPFC_ADD, ds_cstr(&s), &usable); + if (error) { + ovs_fatal(0, "%s:%d: %s", filename, line_number, error); + } + usable_protocols &= usable; version = xmalloc(sizeof *version); - version->cookie = fm.cookie; + version->cookie = fm.new_cookie; version->idle_timeout = fm.idle_timeout; version->hard_timeout = fm.hard_timeout; - version->flags = fm.flags & (OFPFF_SEND_FLOW_REM | OFPFF_EMERG); - version->actions = fm.actions; - version->n_actions = fm.n_actions; + version->flags = fm.flags & (OFPUTIL_FF_SEND_FLOW_REM + | OFPUTIL_FF_EMERG); + version->ofpacts = fm.ofpacts; + version->ofpacts_len = fm.ofpacts_len; - min_ff = ofputil_min_flow_format(&fm.cr); - min_flow_format = MAX(min_flow_format, min_ff); - check_final_format_for_flow_mod(min_flow_format); - - fte_insert(cls, &fm.cr, version, index); + fte_insert(cls, &fm.match, fm.priority, version, index); } ds_destroy(&s); @@ -1298,139 +2373,161 @@ read_flows_from_file(const char *filename, struct classifier *cls, int index) fclose(file); } - return min_flow_format; + return usable_protocols; +} + +static bool +recv_flow_stats_reply(struct vconn *vconn, ovs_be32 send_xid, + struct ofpbuf **replyp, + struct ofputil_flow_stats *fs, struct ofpbuf *ofpacts) +{ + struct ofpbuf *reply = *replyp; + + for (;;) { + int retval; + bool more; + + /* Get a flow stats reply message, if we don't already have one. */ + if (!reply) { + enum ofptype type; + enum ofperr error; + + do { + run(vconn_recv_block(vconn, &reply), + "OpenFlow packet receive failed"); + } while (((struct ofp_header *) ofpbuf_data(reply))->xid != send_xid); + + error = ofptype_decode(&type, ofpbuf_data(reply)); + if (error || type != OFPTYPE_FLOW_STATS_REPLY) { + ovs_fatal(0, "received bad reply: %s", + ofp_to_string(ofpbuf_data(reply), ofpbuf_size(reply), + verbosity + 1)); + } + } + + /* Pull an individual flow stats reply out of the message. */ + retval = ofputil_decode_flow_stats_reply(fs, reply, false, ofpacts); + switch (retval) { + case 0: + *replyp = reply; + return true; + + case EOF: + more = ofpmp_more(reply->frame); + ofpbuf_delete(reply); + reply = NULL; + if (!more) { + *replyp = NULL; + return false; + } + break; + + default: + ovs_fatal(0, "parse error in reply (%s)", + ofperr_to_string(retval)); + } + } } /* Reads the OpenFlow flow table from 'vconn', which has currently active flow - * format 'flow_format', and adds them as flow table entries in 'cls' for the + * format 'protocol', and adds them as flow table entries in 'cls' for the * version with the specified 'index'. */ static void -read_flows_from_switch(struct vconn *vconn, enum nx_flow_format flow_format, +read_flows_from_switch(struct vconn *vconn, + enum ofputil_protocol protocol, struct classifier *cls, int index) { struct ofputil_flow_stats_request fsr; + struct ofputil_flow_stats fs; struct ofpbuf *request; + struct ofpbuf ofpacts; + struct ofpbuf *reply; ovs_be32 send_xid; - bool done; fsr.aggregate = false; - cls_rule_init_catchall(&fsr.match, 0); - fsr.out_port = OFPP_NONE; + match_init_catchall(&fsr.match); + fsr.out_port = OFPP_ANY; fsr.table_id = 0xff; fsr.cookie = fsr.cookie_mask = htonll(0); - request = ofputil_encode_flow_stats_request(&fsr, flow_format); - send_xid = ((struct ofp_header *) request->data)->xid; + request = ofputil_encode_flow_stats_request(&fsr, protocol); + send_xid = ((struct ofp_header *) ofpbuf_data(request))->xid; send_openflow_buffer(vconn, request); - done = false; - while (!done) { - ovs_be32 recv_xid; - struct ofpbuf *reply; - - run(vconn_recv_block(vconn, &reply), "OpenFlow packet receive failed"); - recv_xid = ((struct ofp_header *) reply->data)->xid; - if (send_xid == recv_xid) { - const struct ofputil_msg_type *type; - const struct ofp_stats_msg *osm; - enum ofputil_msg_code code; - - ofputil_decode_msg_type(reply->data, &type); - code = ofputil_msg_type_code(type); - if (code != OFPUTIL_OFPST_FLOW_REPLY && - code != OFPUTIL_NXST_FLOW_REPLY) { - ovs_fatal(0, "received bad reply: %s", - ofp_to_string(reply->data, reply->size, - verbosity + 1)); - } - - osm = reply->data; - if (!(osm->flags & htons(OFPSF_REPLY_MORE))) { - done = true; - } - - for (;;) { - struct fte_version *version; - struct ofputil_flow_stats fs; - int retval; - - retval = ofputil_decode_flow_stats_reply(&fs, reply); - if (retval) { - if (retval != EOF) { - ovs_fatal(0, "parse error in reply"); - } - break; - } - - version = xmalloc(sizeof *version); - version->cookie = fs.cookie; - version->idle_timeout = fs.idle_timeout; - version->hard_timeout = fs.hard_timeout; - version->flags = 0; - version->n_actions = fs.n_actions; - version->actions = xmemdup(fs.actions, - fs.n_actions * sizeof *fs.actions); + reply = NULL; + ofpbuf_init(&ofpacts, 0); + while (recv_flow_stats_reply(vconn, send_xid, &reply, &fs, &ofpacts)) { + struct fte_version *version; - fte_insert(cls, &fs.rule, version, index); - } - } else { - VLOG_DBG("received reply with xid %08"PRIx32" " - "!= expected %08"PRIx32, recv_xid, send_xid); - } - ofpbuf_delete(reply); + version = xmalloc(sizeof *version); + version->cookie = fs.cookie; + version->idle_timeout = fs.idle_timeout; + version->hard_timeout = fs.hard_timeout; + version->flags = 0; + version->ofpacts_len = fs.ofpacts_len; + version->ofpacts = xmemdup(fs.ofpacts, fs.ofpacts_len); + + fte_insert(cls, &fs.match, fs.priority, version, index); } + ofpbuf_uninit(&ofpacts); } static void fte_make_flow_mod(const struct fte *fte, int index, uint16_t command, - enum nx_flow_format flow_format, struct list *packets) + enum ofputil_protocol protocol, struct list *packets) { const struct fte_version *version = fte->versions[index]; struct ofputil_flow_mod fm; struct ofpbuf *ofm; - fm.cr = fte->rule; - fm.cookie = version->cookie; + 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_NONE; + fm.out_port = OFPP_ANY; fm.flags = version->flags; if (command == OFPFC_ADD || command == OFPFC_MODIFY || command == OFPFC_MODIFY_STRICT) { - fm.actions = version->actions; - fm.n_actions = version->n_actions; + fm.ofpacts = version->ofpacts; + fm.ofpacts_len = version->ofpacts_len; } else { - fm.actions = NULL; - fm.n_actions = 0; + fm.ofpacts = NULL; + fm.ofpacts_len = 0; } - ofm = ofputil_encode_flow_mod(&fm, flow_format, false); + ofm = ofputil_encode_flow_mod(&fm, protocol); list_push_back(packets, &ofm->list_node); } static void -do_replace_flows(int argc OVS_UNUSED, char *argv[]) +ofctl_replace_flows(int argc OVS_UNUSED, char *argv[]) { enum { FILE_IDX = 0, SWITCH_IDX = 1 }; - enum nx_flow_format min_flow_format, flow_format; + enum ofputil_protocol usable_protocols, protocol; struct cls_cursor cursor; struct classifier cls; struct list requests; struct vconn *vconn; struct fte *fte; - classifier_init(&cls); - min_flow_format = read_flows_from_file(argv[2], &cls, FILE_IDX); + classifier_init(&cls, NULL); + usable_protocols = read_flows_from_file(argv[2], &cls, FILE_IDX); - open_vconn(argv[1], &vconn); - flow_format = negotiate_highest_flow_format(vconn, min_flow_format); - read_flows_from_switch(vconn, flow_format, &cls, SWITCH_IDX); + protocol = open_vconn(argv[1], &vconn); + protocol = set_protocol_for_flow_dump(vconn, protocol, usable_protocols); + + read_flows_from_switch(vconn, protocol, &cls, SWITCH_IDX); list_init(&requests); /* Delete flows that exist on the switch but not in the file. */ + fat_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]; @@ -1438,7 +2535,7 @@ do_replace_flows(int argc OVS_UNUSED, char *argv[]) if (sw_ver && !file_ver) { fte_make_flow_mod(fte, SWITCH_IDX, OFPFC_DELETE_STRICT, - flow_format, &requests); + protocol, &requests); } } @@ -1451,10 +2548,10 @@ do_replace_flows(int argc OVS_UNUSED, char *argv[]) if (file_ver && (readd || !sw_ver || !fte_version_equals(sw_ver, file_ver))) { - fte_make_flow_mod(fte, FILE_IDX, OFPFC_ADD, flow_format, - &requests); + fte_make_flow_mod(fte, FILE_IDX, OFPFC_ADD, protocol, &requests); } } + fat_rwlock_unlock(&cls.rwlock); transact_multiple_noreply(vconn, &requests); vconn_close(vconn); @@ -1470,48 +2567,56 @@ read_flows_from_source(const char *source, struct classifier *cls, int index) || (!strchr(source, ':') && !stat(source, &s))) { read_flows_from_file(source, cls, index); } else { - enum nx_flow_format flow_format; + enum ofputil_protocol protocol; struct vconn *vconn; - open_vconn(source, &vconn); - flow_format = negotiate_highest_flow_format(vconn, NXFF_OPENFLOW10); - read_flows_from_switch(vconn, flow_format, cls, index); + protocol = open_vconn(source, &vconn); + protocol = set_protocol_for_flow_dump(vconn, protocol, OFPUTIL_P_ANY); + read_flows_from_switch(vconn, protocol, cls, index); vconn_close(vconn); } } static void -do_diff_flows(int argc OVS_UNUSED, char *argv[]) +ofctl_diff_flows(int argc OVS_UNUSED, char *argv[]) { bool differences = false; struct cls_cursor cursor; struct classifier cls; + struct ds a_s, b_s; struct fte *fte; - classifier_init(&cls); + classifier_init(&cls, NULL); read_flows_from_source(argv[1], &cls, 0); read_flows_from_source(argv[2], &cls, 1); + ds_init(&a_s); + ds_init(&b_s); + + fat_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)) { - char *rule_s = cls_rule_to_string(&fte->rule); - if (a) { - printf("-%s", rule_s); - fte_version_print(a); - } - if (b) { - printf("+%s", rule_s); - fte_version_print(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; } - free(rule_s); - - differences = true; } } + fat_rwlock_unlock(&cls.rwlock); + + ds_destroy(&a_s); + ds_destroy(&b_s); fte_free_all(&cls); @@ -1519,125 +2624,231 @@ do_diff_flows(int argc OVS_UNUSED, char *argv[]) exit(2); } } + +static void +ofctl_meter_mod__(const char *bridge, const char *str, int command) +{ + struct ofputil_meter_mod mm; + struct vconn *vconn; + enum ofputil_protocol protocol; + enum ofputil_protocol usable_protocols; + enum ofp_version version; + + if (str) { + char *error; + error = parse_ofp_meter_mod_str(&mm, str, command, &usable_protocols); + if (error) { + ovs_fatal(0, "%s", error); + } + } else { + usable_protocols = OFPUTIL_P_OF13_UP; + mm.command = command; + mm.meter.meter_id = OFPM13_ALL; + } + + protocol = open_vconn_for_flow_mod(bridge, &vconn, usable_protocols); + version = ofputil_protocol_to_ofp_version(protocol); + transact_noreply(vconn, ofputil_encode_meter_mod(version, &mm)); + vconn_close(vconn); +} + +static void +ofctl_meter_request__(const char *bridge, const char *str, + enum ofputil_meter_request_type type) +{ + struct ofputil_meter_mod mm; + struct vconn *vconn; + enum ofputil_protocol usable_protocols; + enum ofputil_protocol protocol; + enum ofp_version version; + + if (str) { + char *error; + error = parse_ofp_meter_mod_str(&mm, str, -1, &usable_protocols); + if (error) { + ovs_fatal(0, "%s", error); + } + } else { + usable_protocols = OFPUTIL_P_OF13_UP; + mm.meter.meter_id = OFPM13_ALL; + } + + protocol = open_vconn_for_flow_mod(bridge, &vconn, usable_protocols); + version = ofputil_protocol_to_ofp_version(protocol); + transact_noreply(vconn, ofputil_encode_meter_request(version, + type, + mm.meter.meter_id)); + vconn_close(vconn); +} + + +static void +ofctl_add_meter(int argc OVS_UNUSED, char *argv[]) +{ + ofctl_meter_mod__(argv[1], argv[2], OFPMC13_ADD); +} + +static void +ofctl_mod_meter(int argc OVS_UNUSED, char *argv[]) +{ + ofctl_meter_mod__(argv[1], argv[2], OFPMC13_MODIFY); +} + +static void +ofctl_del_meters(int argc, char *argv[]) +{ + ofctl_meter_mod__(argv[1], argc > 2 ? argv[2] : NULL, OFPMC13_DELETE); +} + +static void +ofctl_dump_meters(int argc, char *argv[]) +{ + ofctl_meter_request__(argv[1], argc > 2 ? argv[2] : NULL, + OFPUTIL_METER_CONFIG); +} + +static void +ofctl_meter_stats(int argc, char *argv[]) +{ + ofctl_meter_request__(argv[1], argc > 2 ? argv[2] : NULL, + OFPUTIL_METER_STATS); +} + +static void +ofctl_meter_features(int argc OVS_UNUSED, char *argv[]) +{ + ofctl_meter_request__(argv[1], NULL, OFPUTIL_METER_FEATURES); +} + /* Undocumented commands for unit testing. */ static void -print_packet_list(struct list *packets) +ofctl_parse_flows__(struct ofputil_flow_mod *fms, size_t n_fms, + enum ofputil_protocol usable_protocols) { - struct ofpbuf *packet, *next; + enum ofputil_protocol protocol = 0; + char *usable_s; + size_t i; - LIST_FOR_EACH_SAFE (packet, next, list_node, packets) { - ofp_print(stdout, packet->data, packet->size, verbosity); - list_remove(&packet->list_node); - ofpbuf_delete(packet); + usable_s = ofputil_protocols_to_string(usable_protocols); + printf("usable protocols: %s\n", usable_s); + free(usable_s); + + if (!(usable_protocols & allowed_protocols)) { + ovs_fatal(0, "no usable protocol"); + } + for (i = 0; i < sizeof(enum ofputil_protocol) * CHAR_BIT; i++) { + protocol = 1 << i; + if (protocol & usable_protocols & allowed_protocols) { + break; + } + } + ovs_assert(is_pow2(protocol)); + + printf("chosen protocol: %s\n", ofputil_protocol_to_string(protocol)); + + for (i = 0; i < n_fms; i++) { + struct ofputil_flow_mod *fm = &fms[i]; + struct ofpbuf *msg; + + msg = ofputil_encode_flow_mod(fm, protocol); + ofp_print(stdout, ofpbuf_data(msg), ofpbuf_size(msg), verbosity); + ofpbuf_delete(msg); + + 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 -do_parse_flow(int argc OVS_UNUSED, char *argv[]) +ofctl_parse_flow(int argc OVS_UNUSED, char *argv[]) { - enum nx_flow_format flow_format; - bool flow_mod_table_id; - struct list packets; + enum ofputil_protocol usable_protocols; + struct ofputil_flow_mod fm; + char *error; - flow_format = NXFF_OPENFLOW10; - if (preferred_flow_format > 0) { - flow_format = preferred_flow_format; + error = parse_ofp_flow_mod_str(&fm, argv[1], OFPFC_ADD, &usable_protocols); + if (error) { + ovs_fatal(0, "%s", error); } - flow_mod_table_id = false; - - list_init(&packets); - parse_ofp_flow_mod_str(&packets, &flow_format, &flow_mod_table_id, - argv[1], OFPFC_ADD, false); - print_packet_list(&packets); + ofctl_parse_flows__(&fm, 1, usable_protocols); } /* "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 -do_parse_flows(int argc OVS_UNUSED, char *argv[]) +ofctl_parse_flows(int argc OVS_UNUSED, char *argv[]) { - enum nx_flow_format flow_format; - bool flow_mod_table_id; - struct list packets; - FILE *file; - - file = fopen(argv[1], "r"); - if (file == NULL) { - ovs_fatal(errno, "%s: open", argv[1]); - } + enum ofputil_protocol usable_protocols; + struct ofputil_flow_mod *fms = NULL; + size_t n_fms = 0; + char *error; - flow_format = NXFF_OPENFLOW10; - if (preferred_flow_format > 0) { - flow_format = preferred_flow_format; - } - flow_mod_table_id = false; - - list_init(&packets); - while (parse_ofp_flow_mod_file(&packets, &flow_format, &flow_mod_table_id, - file, OFPFC_ADD)) { - print_packet_list(&packets); + error = parse_ofp_flow_mod_file(argv[1], OFPFC_ADD, &fms, &n_fms, + &usable_protocols); + if (error) { + ovs_fatal(0, "%s", error); } - fclose(file); + ofctl_parse_flows__(fms, n_fms, usable_protocols); + free(fms); } -/* "parse-nx-match": reads a series of nx_match specifications as strings from - * stdin, does some internal fussing with them, and then prints them back as - * strings on stdout. */ static void -do_parse_nx_match(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) +ofctl_parse_nxm__(bool oxm) { struct ds in; ds_init(&in); - while (!ds_get_line(&in, stdin)) { + while (!ds_get_test_line(&in, stdin)) { struct ofpbuf nx_match; - struct cls_rule rule; + struct match match; ovs_be64 cookie, cookie_mask; enum ofperr error; int match_len; - char *s; - - /* Delete comments, skip blank lines. */ - s = ds_cstr(&in); - if (*s == '#') { - puts(s); - continue; - } - if (strchr(s, '#')) { - *strchr(s, '#') = '\0'; - } - if (s[strspn(s, " ")] == '\0') { - putchar('\n'); - continue; - } /* Convert string to nx_match. */ ofpbuf_init(&nx_match, 0); - match_len = nx_match_from_string(ds_cstr(&in), &nx_match); + if (oxm) { + match_len = oxm_match_from_string(ds_cstr(&in), &nx_match); + } else { + match_len = nx_match_from_string(ds_cstr(&in), &nx_match); + } - /* Convert nx_match to cls_rule. */ + /* Convert nx_match to match. */ if (strict) { - error = nx_pull_match(&nx_match, match_len, 0, &rule, - &cookie, &cookie_mask); + if (oxm) { + error = oxm_pull_match(&nx_match, &match); + } else { + error = nx_pull_match(&nx_match, match_len, &match, + &cookie, &cookie_mask); + } } else { - error = nx_pull_match_loose(&nx_match, match_len, 0, &rule, - &cookie, &cookie_mask); + if (oxm) { + error = oxm_pull_match_loose(&nx_match, &match); + } else { + error = nx_pull_match_loose(&nx_match, match_len, &match, + &cookie, &cookie_mask); + } } + if (!error) { char *out; - /* Convert cls_rule back to nx_match. */ + /* Convert match back to nx_match. */ ofpbuf_uninit(&nx_match); ofpbuf_init(&nx_match, 0); - match_len = nx_put_match(&nx_match, &rule, cookie, cookie_mask); + if (oxm) { + match_len = oxm_put_match(&nx_match, &match); + out = oxm_match_to_string(&nx_match, match_len); + } else { + match_len = nx_put_match(&nx_match, &match, + cookie, cookie_mask); + out = nx_match_to_string(ofpbuf_data(&nx_match), match_len); + } - /* Convert nx_match to string. */ - out = nx_match_to_string(nx_match.data, match_len); puts(out); free(out); } else { @@ -1650,11 +2861,579 @@ do_parse_nx_match(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) ds_destroy(&in); } +/* "parse-nxm": reads a series of NXM nx_match specifications as strings from + * 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) +{ + return ofctl_parse_nxm__(false); +} + +/* "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. */ +static void +ofctl_parse_oxm(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) +{ + return ofctl_parse_nxm__(true); +} + +static void +print_differences(const char *prefix, + const void *a_, size_t a_len, + const void *b_, size_t b_len) +{ + const uint8_t *a = a_; + const uint8_t *b = b_; + size_t i; + + for (i = 0; i < MIN(a_len, b_len); i++) { + if (a[i] != b[i]) { + printf("%s%2"PRIuSIZE": %02"PRIx8" -> %02"PRIx8"\n", + prefix, i, a[i], b[i]); + } + } + for (i = a_len; i < b_len; i++) { + printf("%s%2"PRIuSIZE": (none) -> %02"PRIx8"\n", prefix, i, b[i]); + } + for (i = b_len; i < a_len; i++) { + printf("%s%2"PRIuSIZE": %02"PRIx8" -> (none)\n", prefix, i, a[i]); + } +} + +/* "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) +{ + struct ds in; + + ds_init(&in); + while (!ds_get_preprocessed_line(&in, stdin, NULL)) { + struct ofpbuf of10_out; + struct ofpbuf of10_in; + struct ofpbuf ofpacts; + enum ofperr error; + size_t size; + struct ds s; + + /* Parse hex bytes. */ + ofpbuf_init(&of10_in, 0); + if (ofpbuf_put_hex(&of10_in, ds_cstr(&in), NULL)[0] != '\0') { + ovs_fatal(0, "Trailing garbage in hex data"); + } + + /* Convert to ofpacts. */ + ofpbuf_init(&ofpacts, 0); + size = ofpbuf_size(&of10_in); + error = ofpacts_pull_openflow_actions(&of10_in, ofpbuf_size(&of10_in), + OFP10_VERSION, &ofpacts); + if (error) { + printf("bad OF1.1 actions: %s\n\n", ofperr_get_name(error)); + ofpbuf_uninit(&ofpacts); + ofpbuf_uninit(&of10_in); + continue; + } + ofpbuf_push_uninit(&of10_in, size); + + /* Print cls_rule. */ + ds_init(&s); + ds_put_cstr(&s, "actions="); + ofpacts_format(ofpbuf_data(&ofpacts), ofpbuf_size(&ofpacts), &s); + puts(ds_cstr(&s)); + ds_destroy(&s); + + /* Convert back to ofp10 actions and print differences from input. */ + ofpbuf_init(&of10_out, 0); + ofpacts_put_openflow_actions(ofpbuf_data(&ofpacts), ofpbuf_size(&ofpacts), &of10_out, + OFP10_VERSION); + + print_differences("", ofpbuf_data(&of10_in), ofpbuf_size(&of10_in), + ofpbuf_data(&of10_out), ofpbuf_size(&of10_out)); + putchar('\n'); + + ofpbuf_uninit(&ofpacts); + ofpbuf_uninit(&of10_in); + ofpbuf_uninit(&of10_out); + } + ds_destroy(&in); +} + +/* "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 + * from the input. + * + * The input hex bytes may contain "x"s to represent "don't-cares", bytes whose + * values are ignored in the input and will be set to zero when OVS converts + * 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) +{ + struct ds expout; + struct ds in; + + ds_init(&in); + ds_init(&expout); + while (!ds_get_preprocessed_line(&in, stdin, NULL)) { + struct ofpbuf match_in, match_expout; + struct ofp10_match match_out; + struct ofp10_match match_normal; + struct match match; + char *p; + + /* Parse hex bytes to use for expected output. */ + ds_clear(&expout); + ds_put_cstr(&expout, ds_cstr(&in)); + for (p = ds_cstr(&expout); *p; p++) { + if (*p == 'x') { + *p = '0'; + } + } + ofpbuf_init(&match_expout, 0); + if (ofpbuf_put_hex(&match_expout, ds_cstr(&expout), NULL)[0] != '\0') { + ovs_fatal(0, "Trailing garbage in hex data"); + } + if (ofpbuf_size(&match_expout) != sizeof(struct ofp10_match)) { + ovs_fatal(0, "Input is %"PRIu32" bytes, expected %"PRIuSIZE, + ofpbuf_size(&match_expout), sizeof(struct ofp10_match)); + } + + /* Parse hex bytes for input. */ + for (p = ds_cstr(&in); *p; p++) { + if (*p == 'x') { + *p = "0123456789abcdef"[random_uint32() & 0xf]; + } + } + ofpbuf_init(&match_in, 0); + if (ofpbuf_put_hex(&match_in, ds_cstr(&in), NULL)[0] != '\0') { + ovs_fatal(0, "Trailing garbage in hex data"); + } + if (ofpbuf_size(&match_in) != sizeof(struct ofp10_match)) { + ovs_fatal(0, "Input is %"PRIu32" bytes, expected %"PRIuSIZE, + ofpbuf_size(&match_in), sizeof(struct ofp10_match)); + } + + /* Convert to cls_rule and print. */ + ofputil_match_from_ofp10_match(ofpbuf_data(&match_in), &match); + match_print(&match); + + /* Convert back to ofp10_match and print differences from input. */ + ofputil_match_to_ofp10_match(&match, &match_out); + print_differences("", ofpbuf_data(&match_expout), ofpbuf_size(&match_expout), + &match_out, sizeof match_out); + + /* Normalize, then convert and compare again. */ + ofputil_normalize_match(&match); + ofputil_match_to_ofp10_match(&match, &match_normal); + print_differences("normal: ", &match_out, sizeof match_out, + &match_normal, sizeof match_normal); + putchar('\n'); + + ofpbuf_uninit(&match_in); + ofpbuf_uninit(&match_expout); + } + ds_destroy(&in); + ds_destroy(&expout); +} + +/* "parse-ofp11-match": reads a series of ofp11_match specifications as hex + * bytes from stdin, converts them to "struct match"es, 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_match(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) +{ + struct ds in; + + ds_init(&in); + while (!ds_get_preprocessed_line(&in, stdin, NULL)) { + struct ofpbuf match_in; + struct ofp11_match match_out; + struct match match; + enum ofperr error; + + /* Parse hex bytes. */ + ofpbuf_init(&match_in, 0); + if (ofpbuf_put_hex(&match_in, ds_cstr(&in), NULL)[0] != '\0') { + ovs_fatal(0, "Trailing garbage in hex data"); + } + if (ofpbuf_size(&match_in) != sizeof(struct ofp11_match)) { + ovs_fatal(0, "Input is %"PRIu32" bytes, expected %"PRIuSIZE, + ofpbuf_size(&match_in), sizeof(struct ofp11_match)); + } + + /* Convert to match. */ + error = ofputil_match_from_ofp11_match(ofpbuf_data(&match_in), &match); + if (error) { + printf("bad ofp11_match: %s\n\n", ofperr_get_name(error)); + ofpbuf_uninit(&match_in); + continue; + } + + /* Print match. */ + match_print(&match); + + /* Convert back to ofp11_match and print differences from input. */ + ofputil_match_to_ofp11_match(&match, &match_out); + + print_differences("", ofpbuf_data(&match_in), ofpbuf_size(&match_in), + &match_out, sizeof match_out); + putchar('\n'); + + ofpbuf_uninit(&match_in); + } + 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 = ofpbuf_size(&of11_in); + error = ofpacts_pull_openflow_actions(&of11_in, ofpbuf_size(&of11_in), + 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(ofpbuf_data(&ofpacts), ofpbuf_size(&ofpacts), &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(ofpbuf_data(&ofpacts), ofpbuf_size(&ofpacts), &of11_out, + OFP11_VERSION); + + print_differences("", ofpbuf_data(&of11_in), ofpbuf_size(&of11_in), + ofpbuf_data(&of11_out), ofpbuf_size(&of11_out)); + 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 = ofpbuf_size(&of11_in); + error = ofpacts_pull_openflow_instructions(&of11_in, ofpbuf_size(&of11_in), + OFP11_VERSION, &ofpacts); + if (!error) { + /* Verify actions, enforce consistency. */ + struct flow flow; + memset(&flow, 0, sizeof flow); + error = ofpacts_check_consistency(ofpbuf_data(&ofpacts), ofpbuf_size(&ofpacts), + &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(ofpbuf_data(&ofpacts), ofpbuf_size(&ofpacts), &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(ofpbuf_data(&ofpacts), ofpbuf_size(&ofpacts), + &of11_out, OFP13_VERSION); + + print_differences("", ofpbuf_data(&of11_in), ofpbuf_size(&of11_in), + ofpbuf_data(&of11_out), ofpbuf_size(&of11_out)); + 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[]) +{ + FILE *pcap; + + pcap = ovs_pcap_open(argv[1], "rb"); + if (!pcap) { + ovs_fatal(errno, "%s: open failed", argv[1]); + } + + for (;;) { + struct ofpbuf *packet; + struct flow flow; + const struct pkt_metadata md = PKT_METADATA_INITIALIZER(ODPP_NONE); + int error; + + error = ovs_pcap_read(pcap, &packet, NULL); + if (error == EOF) { + break; + } else if (error) { + ovs_fatal(error, "%s: read failed", argv[1]); + } + + flow_extract(packet, &md, &flow); + flow_print(stdout, &flow); + putchar('\n'); + ofpbuf_delete(packet); + } +} + +/* "check-vlan VLAN_TCI VLAN_TCI_MASK": converts the specified vlan_tci and + * mask values to and from various formats and prints the results. */ +static void +ofctl_check_vlan(int argc OVS_UNUSED, char *argv[]) +{ + struct match match; + + char *string_s; + struct ofputil_flow_mod fm; + + struct ofpbuf nxm; + struct match nxm_match; + int nxm_match_len; + char *nxm_s; + + struct ofp10_match of10_raw; + struct match of10_match; + + struct ofp11_match of11_raw; + struct match of11_match; + + enum ofperr error; + char *error_s; + + 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)); + + /* Convert to and from string. */ + string_s = match_to_string(&match, OFP_DEFAULT_PRIORITY); + printf("%s -> ", string_s); + fflush(stdout); + error_s = parse_ofp_str(&fm, -1, string_s, &usable_protocols); + if (error_s) { + ovs_fatal(0, "%s", error_s); + } + printf("%04"PRIx16"/%04"PRIx16"\n", + ntohs(fm.match.flow.vlan_tci), + ntohs(fm.match.wc.masks.vlan_tci)); + free(string_s); + + /* Convert to and from NXM. */ + ofpbuf_init(&nxm, 0); + nxm_match_len = nx_put_match(&nxm, &match, htonll(0), htonll(0)); + nxm_s = nx_match_to_string(ofpbuf_data(&nxm), nxm_match_len); + error = nx_pull_match(&nxm, nxm_match_len, &nxm_match, NULL, NULL); + printf("NXM: %s -> ", nxm_s); + if (error) { + printf("%s\n", ofperr_to_string(error)); + } else { + printf("%04"PRIx16"/%04"PRIx16"\n", + ntohs(nxm_match.flow.vlan_tci), + ntohs(nxm_match.wc.masks.vlan_tci)); + } + free(nxm_s); + ofpbuf_uninit(&nxm); + + /* Convert to and from OXM. */ + ofpbuf_init(&nxm, 0); + nxm_match_len = oxm_put_match(&nxm, &match); + nxm_s = oxm_match_to_string(&nxm, nxm_match_len); + error = oxm_pull_match(&nxm, &nxm_match); + printf("OXM: %s -> ", nxm_s); + if (error) { + printf("%s\n", ofperr_to_string(error)); + } else { + uint16_t vid = ntohs(nxm_match.flow.vlan_tci) & + (VLAN_VID_MASK | VLAN_CFI); + uint16_t mask = ntohs(nxm_match.wc.masks.vlan_tci) & + (VLAN_VID_MASK | VLAN_CFI); + + printf("%04"PRIx16"/%04"PRIx16",", vid, mask); + if (vid && vlan_tci_to_pcp(nxm_match.wc.masks.vlan_tci)) { + printf("%02"PRIx8"\n", vlan_tci_to_pcp(nxm_match.flow.vlan_tci)); + } else { + printf("--\n"); + } + } + free(nxm_s); + ofpbuf_uninit(&nxm); + + /* Convert to and from OpenFlow 1.0. */ + ofputil_match_to_ofp10_match(&match, &of10_raw); + ofputil_match_from_ofp10_match(&of10_raw, &of10_match); + printf("OF1.0: %04"PRIx16"/%d,%02"PRIx8"/%d -> %04"PRIx16"/%04"PRIx16"\n", + ntohs(of10_raw.dl_vlan), + (of10_raw.wildcards & htonl(OFPFW10_DL_VLAN)) != 0, + of10_raw.dl_vlan_pcp, + (of10_raw.wildcards & htonl(OFPFW10_DL_VLAN_PCP)) != 0, + ntohs(of10_match.flow.vlan_tci), + ntohs(of10_match.wc.masks.vlan_tci)); + + /* Convert to and from OpenFlow 1.1. */ + ofputil_match_to_ofp11_match(&match, &of11_raw); + ofputil_match_from_ofp11_match(&of11_raw, &of11_match); + printf("OF1.1: %04"PRIx16"/%d,%02"PRIx8"/%d -> %04"PRIx16"/%04"PRIx16"\n", + ntohs(of11_raw.dl_vlan), + (of11_raw.wildcards & htonl(OFPFW11_DL_VLAN)) != 0, + of11_raw.dl_vlan_pcp, + (of11_raw.wildcards & htonl(OFPFW11_DL_VLAN_PCP)) != 0, + ntohs(of11_match.flow.vlan_tci), + ntohs(of11_match.wc.masks.vlan_tci)); +} + +/* "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[]) +{ + enum ofperr error; + int version; + + error = ofperr_from_name(argv[1]); + if (!error) { + ovs_fatal(0, "unknown error \"%s\"", argv[1]); + } + + for (version = 0; version <= UINT8_MAX; version++) { + const char *name = ofperr_domain_get_name(version); + if (name) { + int vendor = ofperr_get_vendor(error, version); + int type = ofperr_get_type(error, version); + int code = ofperr_get_code(error, version); + + if (vendor != -1 || type != -1 || code != -1) { + printf("%s: vendor %#x, type %d, code %d\n", + name, vendor, type, code); + } + } + } +} + +/* "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[]) +{ + const struct ofp_header *oh; + struct ofpbuf request, *reply; + enum ofperr error; + + error = ofperr_from_name(argv[1]); + if (!error) { + ovs_fatal(0, "unknown error \"%s\"", argv[1]); + } + + ofpbuf_init(&request, 0); + if (ofpbuf_put_hex(&request, argv[2], NULL)[0] != '\0') { + ovs_fatal(0, "Trailing garbage in hex data"); + } + if (ofpbuf_size(&request) < sizeof(struct ofp_header)) { + ovs_fatal(0, "Request too short"); + } + + oh = ofpbuf_data(&request); + if (ofpbuf_size(&request) != ntohs(oh->length)) { + ovs_fatal(0, "Request size inconsistent"); + } + + reply = ofperr_encode_reply(error, ofpbuf_data(&request)); + ofpbuf_uninit(&request); + + ovs_hex_dump(stdout, ofpbuf_data(reply), ofpbuf_size(reply), 0, false); + ofpbuf_delete(reply); +} + /* "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). */ static void -do_ofp_print(int argc, char *argv[]) +ofctl_ofp_print(int argc, char *argv[]) { struct ofpbuf packet; @@ -1662,39 +3441,94 @@ do_ofp_print(int argc, char *argv[]) if (ofpbuf_put_hex(&packet, argv[1], 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, ofpbuf_data(&packet), ofpbuf_size(&packet), argc > 2 ? atoi(argv[2]) : 2); ofpbuf_uninit(&packet); } +/* "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[]) +{ + uint32_t bitmap = strtol(argv[1], NULL, 0); + struct ofpbuf *hello; + + hello = ofputil_encode_hello(bitmap); + ovs_hex_dump(stdout, ofpbuf_data(hello), ofpbuf_size(hello), 0, false); + ofp_print(stdout, ofpbuf_data(hello), ofpbuf_size(hello), verbosity); + ofpbuf_delete(hello); +} + static const struct command all_commands[] = { - { "show", 1, 1, do_show }, - { "monitor", 1, 3, do_monitor }, - { "snoop", 1, 1, do_snoop }, - { "dump-desc", 1, 1, do_dump_desc }, - { "dump-tables", 1, 1, do_dump_tables }, - { "dump-flows", 1, 2, do_dump_flows }, - { "dump-aggregate", 1, 2, do_dump_aggregate }, - { "queue-stats", 1, 3, do_queue_stats }, - { "add-flow", 2, 2, do_add_flow }, - { "add-flows", 2, 2, do_add_flows }, - { "mod-flows", 2, 2, do_mod_flows }, - { "del-flows", 1, 2, do_del_flows }, - { "replace-flows", 2, 2, do_replace_flows }, - { "diff-flows", 2, 2, do_diff_flows }, - { "dump-ports", 1, 2, do_dump_ports }, - { "mod-port", 3, 3, do_mod_port }, - { "get-frags", 1, 1, do_get_frags }, - { "set-frags", 2, 2, do_set_frags }, - { "probe", 1, 1, do_probe }, - { "ping", 1, 2, do_ping }, - { "benchmark", 3, 3, do_benchmark }, - { "help", 0, INT_MAX, do_help }, + { "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-table-features", 1, 1, ofctl_dump_table_features }, + { "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 }, + { "probe", 1, 1, ofctl_probe }, + { "ping", 1, 2, ofctl_ping }, + { "benchmark", 3, 3, ofctl_benchmark }, + + { "ofp-parse", 1, 1, ofctl_ofp_parse }, + { "ofp-parse-pcap", 1, INT_MAX, ofctl_ofp_parse_pcap }, + + { "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 }, /* Undocumented commands for testing. */ - { "parse-flow", 1, 1, do_parse_flow }, - { "parse-flows", 1, 1, do_parse_flows }, - { "parse-nx-match", 0, 0, do_parse_nx_match }, - { "ofp-print", 1, 2, do_ofp_print }, + { "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 }, }; + +static const struct command *get_all_commands(void) +{ + return all_commands; +}