X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=utilities%2Fovs-ofctl.c;h=b95f5da55856a2d0324e45e12e852c731bcee81f;hb=f25d0cf3c366;hp=607ec256a6d509365cd429fa0a057ad74bacd035;hpb=31c6fcd7d928dfeadd89eb8c30e4045ae68083be;p=cascardo%2Fovs.git diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c index 607ec256a..b95f5da55 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 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,9 +35,9 @@ #include "compiler.h" #include "dirs.h" #include "dynamic-string.h" -#include "netlink.h" #include "nx-match.h" #include "odp-util.h" +#include "ofp-actions.h" #include "ofp-errors.h" #include "ofp-parse.h" #include "ofp-print.h" @@ -67,9 +67,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 @@ -146,9 +146,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; @@ -168,7 +168,7 @@ parse_options(int argc, char *argv[]) usage(); case 'V': - ovs_print_version(OFP_VERSION, OFP_VERSION); + ovs_print_version(OFP10_VERSION, OFP10_VERSION); exit(EXIT_SUCCESS); case OPT_STRICT: @@ -210,6 +210,7 @@ usage(void) " 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" @@ -277,17 +278,19 @@ 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), + run(vconn_open_block(vconn_name, OFP10_VERSION, vconnp), "connecting to %s", vconn_name); free(vconn_name); } -static void +static enum ofputil_protocol open_vconn__(const char *name, const char *default_suffix, struct vconn **vconnp) { char *datapath_name, *datapath_type, *socket_name; + enum ofputil_protocol protocol; char *bridge_path; + int ofp_version; struct stat s; bridge_path = xasprintf("%s/%s.%s", ovs_rundir(), name, default_suffix); @@ -299,7 +302,7 @@ open_vconn__(const char *name, const char *default_suffix, free(datapath_type); if (strchr(name, ':')) { - run(vconn_open_block(name, OFP_VERSION, vconnp), + run(vconn_open_block(name, OFP10_VERSION, vconnp), "connecting to %s", name); } else if (!stat(name, &s) && S_ISSOCK(s.st_mode)) { open_vconn_socket(name, vconnp); @@ -317,9 +320,17 @@ open_vconn__(const char *name, const char *default_suffix, free(bridge_path); free(socket_name); + + 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 +static enum ofputil_protocol open_vconn(const char *name, struct vconn **vconnp) { return open_vconn__(name, "mgmt", vconnp); @@ -330,7 +341,7 @@ alloc_stats_request(size_t rq_len, uint16_t type, struct ofpbuf **bufferp) { struct ofp_stats_msg *rq; - rq = make_openflow(rq_len, OFPT_STATS_REQUEST, bufferp); + rq = make_openflow(rq_len, OFPT10_STATS_REQUEST, bufferp); rq->type = htons(type); rq->flags = htons(0); return rq; @@ -353,6 +364,7 @@ dump_transaction(const char *vconn_name, struct ofpbuf *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); + ofpbuf_delete(reply); vconn_close(vconn); } @@ -368,6 +380,7 @@ static void dump_stats_transaction(const char *vconn_name, struct ofpbuf *request) { ovs_be32 send_xid = ((struct ofp_header *) request->data)->xid; + ovs_be16 stats_type = ((struct ofp_stats_msg *) request->data)->type; struct vconn *vconn; bool done = false; @@ -380,12 +393,21 @@ dump_stats_transaction(const char *vconn_name, struct ofpbuf *request) run(vconn_recv_block(vconn, &reply), "OpenFlow packet receive failed"); recv_xid = ((struct ofp_header *) reply->data)->xid; if (send_xid == recv_xid) { - struct ofp_stats_msg *osm; + const struct ofp_stats_msg *osm = reply->data; + const struct ofp_header *oh = reply->data; ofp_print(stdout, reply->data, reply->size, verbosity + 1); - osm = ofpbuf_at(reply, 0, sizeof *osm); - done = !osm || !(ntohs(osm->flags) & OFPSF_REPLY_MORE); + if (oh->type == OFPT_ERROR) { + done = true; + } else if (oh->type == OFPT10_STATS_REPLY + && osm->type == stats_type) { + done = !(ntohs(osm->flags) & OFPSF_REPLY_MORE); + } else { + ovs_fatal(0, "received bad reply: %s", + ofp_to_string(reply->data, reply->size, + verbosity + 1)); + } } else { VLOG_DBG("received reply with xid %08"PRIx32" " "!= expected %08"PRIx32, recv_xid, send_xid); @@ -484,8 +506,30 @@ set_switch_config(struct vconn *vconn, struct ofp_switch_config *config_) static void do_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; + + make_openflow(sizeof(struct ofp_header), OFPT_FEATURES_REQUEST, + &request); + open_vconn(vconn_name, &vconn); + run(vconn_transact(vconn, request, &reply), "talking to %s", vconn_name); + + trunc = ofputil_switch_features_ports_trunc(reply); + ofp_print(stdout, reply->data, reply->size, verbosity + 1); + + ofpbuf_delete(reply); + vconn_close(vconn); + + 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, OFPST_PORT_DESC); + } + dump_trivial_transaction(vconn_name, OFPT_GET_CONFIG_REQUEST); } static void @@ -500,50 +544,151 @@ do_dump_tables(int argc OVS_UNUSED, char *argv[]) dump_trivial_stats_transaction(argv[1], OFPST_TABLE); } -/* 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) +static bool +fetch_port_by_features(const char *vconn_name, + const char *port_name, unsigned int port_no, + struct ofputil_phy_port *pp, bool *trunc) { + struct ofputil_switch_features features; + const struct ofp_switch_features *osf; struct ofpbuf *request, *reply; - struct ofp_switch_features *osf; - unsigned int port_no; 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; - } + enum ofperr error; + 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); 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); } - 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; + } + + error = ofputil_decode_switch_features(osf, &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(osf->header.version, &b, pp)) { 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; + ? port_no == pp->port_no + : !strcmp(pp->name, port_name)) { + found = true; + goto exit; } } - ovs_fatal(0, "%s: couldn't find port `%s'", vconn_name, port_name); + +exit: + ofpbuf_delete(reply); + return found; +} + +static bool +fetch_port_by_stats(const char *vconn_name, + const char *port_name, unsigned int port_no, + struct ofputil_phy_port *pp) +{ + struct ofpbuf *request; + struct vconn *vconn; + ovs_be32 send_xid; + struct ofpbuf b; + bool done = false; + bool found = false; + + alloc_stats_request(sizeof(struct ofp_stats_msg), OFPST_PORT_DESC, + &request); + send_xid = ((struct ofp_header *) request->data)->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 *) reply->data)->xid; + if (send_xid == recv_xid) { + const struct ofputil_msg_type *type; + struct ofp_stats_msg *osm; + + ofputil_decode_msg_type(reply->data, &type); + if (ofputil_msg_type_code(type) != OFPUTIL_OFPST_PORT_DESC_REPLY) { + ovs_fatal(0, "received bad reply: %s", + ofp_to_string(reply->data, reply->size, + verbosity + 1)); + } + + osm = ofpbuf_at_assert(reply, 0, sizeof *osm); + done = !(ntohs(osm->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; + } + + ofpbuf_use_const(&b, &osm->header, ntohs(osm->header.length)); + ofpbuf_pull(&b, sizeof(struct ofp_stats_msg)); + + while (!ofputil_pull_phy_port(osm->header.version, &b, pp)) { + if (port_no != UINT_MAX ? 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; +} + + +/* 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) +{ + unsigned int port_no; + bool found; + bool trunc; + + /* Try to interpret the argument as a port number. */ + if (!str_to_uint(port_name, 10, &port_no)) { + port_no = UINT_MAX; + } + + /* 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); + } } /* Returns the port number corresponding to 'port_name' (which may be a port @@ -556,95 +701,82 @@ str_to_port_no(const char *vconn_name, const char *port_name) if (str_to_uint(port_name, 10, &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 true; + } + + run(vconn_transact_noreply(vconn, request, &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 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; - } - - 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)); - } - - VLOG_DBG("%s: negotiated flow format %s", vconn_get_name(vconn), - ofputil_flow_format_to_string(flow_format)); - return flow_format; + 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); } } static void do_dump_flows__(int argc, char *argv[], bool aggregate) { - enum nx_flow_format min_flow_format, flow_format; + enum ofputil_protocol usable_protocols, protocol; struct ofputil_flow_stats_request fsr; struct ofpbuf *request; struct vconn *vconn; parse_ofp_flow_stats_request_str(&fsr, aggregate, argc > 2 ? argv[2] : ""); + usable_protocols = ofputil_flow_stats_request_usable_protocols(&fsr); - 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; - } - flow_format = negotiate_highest_flow_format(vconn, min_flow_format); - request = ofputil_encode_flow_stats_request(&fsr, flow_format); + protocol = open_vconn(argv[1], &vconn); + protocol = set_protocol_for_flow_dump(vconn, protocol, usable_protocols); + request = ofputil_encode_flow_stats_request(&fsr, protocol); dump_stats_transaction(argv[1], request); vconn_close(vconn); } @@ -685,122 +817,110 @@ do_queue_stats(int argc, char *argv[]) dump_stats_transaction(argv[1], request); } -/* 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 enum ofputil_protocol +open_vconn_for_flow_mod(const char *remote, + const struct ofputil_flow_mod *fms, size_t n_fms, + struct vconn **vconnp) { - if (preferred_flow_format < 0) { - return NXFF_OPENFLOW10; - } else { - struct ofpbuf *sff; + enum ofputil_protocol usable_protocols; + enum ofputil_protocol cur_protocol; + char *usable_s; + int i; - sff = ofputil_make_set_flow_format(preferred_flow_format); - list_push_back(requests, &sff->list_node); - return preferred_flow_format; + /* Figure out what flow formats will work. */ + usable_protocols = ofputil_flow_mod_usable_protocols(fms, n_fms); + 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); } -} -/* 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) -{ - 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)); + /* 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) +do_flow_mod__(const char *remote, struct ofputil_flow_mod *fms, size_t n_fms) { - 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, fms, n_fms, &vconn); - 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(fm->ofpacts); } vconn_close(vconn); - - if (file != stdin) { - fclose(file); - } } static void -do_flow_mod__(int argc, char *argv[], uint16_t command) +do_flow_mod_file(int argc OVS_UNUSED, char *argv[], uint16_t command) { - enum nx_flow_format flow_format; - bool flow_mod_table_id; - struct list requests; - struct vconn *vconn; + struct ofputil_flow_mod *fms = NULL; + size_t n_fms = 0; + parse_ofp_flow_mod_file(argv[2], command, &fms, &n_fms); + do_flow_mod__(argv[1], fms, n_fms); + free(fms); +} + +static void +do_flow_mod(int argc, char *argv[], uint16_t command) +{ if (argc > 2 && !strcmp(argv[2], "-")) { - do_flow_mod_file__(argc, argv, command); - return; + do_flow_mod_file(argc, argv, command); + } else { + struct ofputil_flow_mod fm; + parse_ofp_flow_mod_str(&fm, argc > 2 ? argv[2] : "", command, false); + do_flow_mod__(argv[1], &fm, 1); } - - 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); - - open_vconn(argv[1], &vconn); - transact_multiple_noreply(vconn, &requests); - vconn_close(vconn); } static void do_add_flow(int argc, char *argv[]) { - do_flow_mod__(argc, argv, OFPFC_ADD); + do_flow_mod(argc, argv, OFPFC_ADD); } static void do_add_flows(int argc, char *argv[]) { - do_flow_mod_file__(argc, argv, OFPFC_ADD); + do_flow_mod_file(argc, argv, OFPFC_ADD); } static void do_mod_flows(int argc, char *argv[]) { - do_flow_mod__(argc, argv, strict ? OFPFC_MODIFY_STRICT : OFPFC_MODIFY); + do_flow_mod(argc, argv, strict ? OFPFC_MODIFY_STRICT : OFPFC_MODIFY); } static void do_del_flows(int argc, char *argv[]) { - do_flow_mod__(argc, argv, strict ? OFPFC_DELETE_STRICT : OFPFC_DELETE); + do_flow_mod(argc, argv, strict ? OFPFC_DELETE_STRICT : OFPFC_DELETE); } static void @@ -938,9 +1058,6 @@ ofctl_barrier(struct unixctl_conn *conn, int argc OVS_UNUSED, } msg = ofputil_encode_barrier_request(); - fprintf(stderr, "send: "); - ofp_print(stderr, msg->data, msg->size, verbosity); - error = vconn_send_block(aux->vconn, msg); if (error) { ofpbuf_delete(msg); @@ -1010,7 +1127,7 @@ monitor_vconn(struct vconn *vconn) time_t now = time_wall(); char s[32]; - strftime(s, sizeof s, "%Y-%m-%d %H:%M:%S: ", localtime(&now)); + strftime(s, sizeof s, "%Y-%m-%d %H:%M:%S: ", gmtime(&now)); fputs(s, stderr); } @@ -1018,7 +1135,7 @@ monitor_vconn(struct vconn *vconn) ofp_print(stderr, b->data, b->size, verbosity + 2); ofpbuf_delete(b); - if (barrier_aux.conn && msg_type == OFPT_BARRIER_REPLY) { + if (barrier_aux.conn && msg_type == OFPT10_BARRIER_REPLY) { unixctl_command_reply(barrier_aux.conn, NULL); barrier_aux.conn = NULL; } @@ -1099,6 +1216,12 @@ do_dump_ports(int argc, char *argv[]) dump_stats_transaction(argv[1], request); } +static void +do_dump_ports_desc(int argc OVS_UNUSED, char *argv[]) +{ + dump_trivial_stats_transaction(argv[1], OFPST_PORT_DESC); +} + static void do_probe(int argc OVS_UNUSED, char *argv[]) { @@ -1120,19 +1243,19 @@ static void do_packet_out(int argc, char *argv[]) { struct ofputil_packet_out po; - struct ofpbuf actions; + struct ofpbuf ofpacts; struct vconn *vconn; int i; - ofpbuf_init(&actions, sizeof(union ofp_action)); - parse_ofp_actions(argv[3], &actions); + ofpbuf_init(&ofpacts, 64); + parse_ofpacts(argv[3], &ofpacts); po.buffer_id = UINT32_MAX; po.in_port = (!strcasecmp(argv[2], "none") ? OFPP_NONE : !strcasecmp(argv[2], "local") ? OFPP_LOCAL : str_to_port_no(argv[1], argv[2])); - po.actions = actions.data; - po.n_actions = actions.size / sizeof(union ofp_action); + po.ofpacts = ofpacts.data; + po.ofpacts_len = ofpacts.size; open_vconn(argv[1], &vconn); for (i = 4; i < argc; i++) { @@ -1151,46 +1274,66 @@ do_packet_out(int argc, char *argv[]) ofpbuf_delete(packet); } vconn_close(vconn); + ofpbuf_uninit(&ofpacts); } static void do_mod_port(int argc OVS_UNUSED, char *argv[]) { - struct ofp_port_mod *opm; - struct ofp_phy_port opp; - struct ofpbuf *request; - struct vconn *vconn; + 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 }, + }; - 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); + 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); } @@ -1349,8 +1492,8 @@ struct fte_version { uint16_t idle_timeout; uint16_t hard_timeout; uint16_t flags; - union ofp_action *actions; - size_t n_actions; + struct ofpact *ofpacts; + size_t ofpacts_len; }; /* Frees 'version' and the data that it owns. */ @@ -1358,7 +1501,7 @@ static void fte_version_free(struct fte_version *version) { if (version) { - free(version->actions); + free(version->ofpacts); free(version); } } @@ -1373,9 +1516,8 @@ fte_version_equals(const struct fte_version *a, const struct fte_version *b) return (a->cookie == b->cookie && a->idle_timeout == b->idle_timeout && a->hard_timeout == b->hard_timeout - && a->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 @@ -1396,7 +1538,7 @@ fte_version_print(const struct fte_version *version) } ds_init(&s); - ofp_print_actions(&s, version->actions, version->n_actions); + ofpacts_format(version->ofpacts, version->ofpacts_len, &s); printf(" %s\n", ds_cstr(&s)); ds_destroy(&s); } @@ -1430,6 +1572,7 @@ fte_free_all(struct classifier *cls) classifier_remove(cls, &fte->rule); fte_free(fte); } + classifier_destroy(cls); } /* Searches 'cls' for an FTE matching 'rule', inserting a new one if @@ -1456,12 +1599,12 @@ fte_insert(struct classifier *cls, const struct cls_rule *rule, } /* 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; struct ds s; FILE *file; @@ -1471,25 +1614,22 @@ read_flows_from_file(const char *filename, struct classifier *cls, int index) } ds_init(&s); - min_flow_format = NXFF_OPENFLOW10; + usable_protocols = OFPUTIL_P_ANY; while (!ds_get_preprocessed_line(&s, file)) { struct fte_version *version; struct ofputil_flow_mod fm; - enum nx_flow_format min_ff; parse_ofp_str(&fm, OFPFC_ADD, ds_cstr(&s), true); 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->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); + usable_protocols &= ofputil_usable_protocols(&fm.cr); fte_insert(cls, &fm.cr, version, index); } @@ -1499,14 +1639,15 @@ read_flows_from_file(const char *filename, struct classifier *cls, int index) fclose(file); } - return min_flow_format; + return usable_protocols; } /* 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; @@ -1519,7 +1660,7 @@ read_flows_from_switch(struct vconn *vconn, enum nx_flow_format flow_format, fsr.out_port = OFPP_NONE; fsr.table_id = 0xff; fsr.cookie = fsr.cookie_mask = htonll(0); - request = ofputil_encode_flow_stats_request(&fsr, flow_format); + request = ofputil_encode_flow_stats_request(&fsr, protocol); send_xid = ((struct ofp_header *) request->data)->xid; send_openflow_buffer(vconn, request); @@ -1552,10 +1693,14 @@ read_flows_from_switch(struct vconn *vconn, enum nx_flow_format flow_format, for (;;) { struct fte_version *version; struct ofputil_flow_stats fs; + struct ofpbuf ofpacts; int retval; - retval = ofputil_decode_flow_stats_reply(&fs, reply, false); + ofpbuf_init(&ofpacts, 64); + retval = ofputil_decode_flow_stats_reply(&fs, reply, false, + &ofpacts); if (retval) { + ofpbuf_uninit(&ofpacts); if (retval != EOF) { ovs_fatal(0, "parse error in reply"); } @@ -1567,9 +1712,8 @@ read_flows_from_switch(struct vconn *vconn, enum nx_flow_format flow_format, 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); + version->ofpacts = ofpbuf_steal_data(&ofpacts); + version->ofpacts_len = ofpacts.size; fte_insert(cls, &fs.rule, version, index); } @@ -1583,14 +1727,16 @@ read_flows_from_switch(struct vconn *vconn, enum nx_flow_format flow_format, 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; + fm.cookie = htonll(0); + fm.cookie_mask = htonll(0); + fm.new_cookie = version->cookie; fm.table_id = 0xff; fm.command = command; fm.idle_timeout = version->idle_timeout; @@ -1600,14 +1746,14 @@ fte_make_flow_mod(const struct fte *fte, int index, uint16_t command, 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); } @@ -1615,7 +1761,7 @@ static void do_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; @@ -1623,11 +1769,12 @@ do_replace_flows(int argc OVS_UNUSED, char *argv[]) struct fte *fte; classifier_init(&cls); - min_flow_format = read_flows_from_file(argv[2], &cls, FILE_IDX); + 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); @@ -1639,7 +1786,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); } } @@ -1652,8 +1799,7 @@ 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); } } transact_multiple_noreply(vconn, &requests); @@ -1671,12 +1817,12 @@ 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); } } @@ -1724,14 +1870,40 @@ do_diff_flows(int argc OVS_UNUSED, char *argv[]) /* Undocumented commands for unit testing. */ static void -print_packet_list(struct list *packets) +do_parse_flows__(struct ofputil_flow_mod *fms, size_t n_fms) { - struct ofpbuf *packet, *next; + enum ofputil_protocol usable_protocols; + 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_protocols = ofputil_flow_mod_usable_protocols(fms, n_fms); + 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; + } + } + 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, msg->data, msg->size, verbosity); + ofpbuf_delete(msg); + + free(fm->ofpacts); } } @@ -1740,20 +1912,10 @@ print_packet_list(struct list *packets) static void do_parse_flow(int argc OVS_UNUSED, char *argv[]) { - enum nx_flow_format flow_format; - bool flow_mod_table_id; - struct list packets; - - flow_format = NXFF_OPENFLOW10; - if (preferred_flow_format > 0) { - flow_format = preferred_flow_format; - } - flow_mod_table_id = false; + struct ofputil_flow_mod fm; - list_init(&packets); - parse_ofp_flow_mod_str(&packets, &flow_format, &flow_mod_table_id, - argv[1], OFPFC_ADD, false); - print_packet_list(&packets); + parse_ofp_flow_mod_str(&fm, argv[1], OFPFC_ADD, false); + do_parse_flows__(&fm, 1); } /* "parse-flows FILENAME": reads the named file as a sequence of flows (like @@ -1761,60 +1923,26 @@ do_parse_flow(int argc OVS_UNUSED, char *argv[]) static void do_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]); - } + struct ofputil_flow_mod *fms = NULL; + size_t n_fms = 0; - 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); - } - fclose(file); + parse_ofp_flow_mod_file(argv[1], OFPFC_ADD, &fms, &n_fms); + do_parse_flows__(fms, n_fms); + 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) +do_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; 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); @@ -1835,7 +1963,8 @@ do_parse_nx_match(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) /* Convert cls_rule back to nx_match. */ ofpbuf_uninit(&nx_match); ofpbuf_init(&nx_match, 0); - match_len = nx_put_match(&nx_match, &rule, cookie, cookie_mask); + match_len = nx_put_match(&nx_match, oxm, &rule, + cookie, cookie_mask); /* Convert nx_match to string. */ out = nx_match_to_string(nx_match.data, match_len); @@ -1851,6 +1980,187 @@ 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 +do_parse_nxm(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) +{ + return do_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 +do_parse_oxm(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) +{ + return do_parse_nxm__(true); +} + +static void +print_differences(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("%2zu: %02"PRIx8" -> %02"PRIx8"\n", i, a[i], b[i]); + } + } + for (i = a_len; i < b_len; i++) { + printf("%2zu: (none) -> %02"PRIx8"\n", i, b[i]); + } + for (i = b_len; i < a_len; i++) { + printf("%2zu: %02"PRIx8" -> (none)\n", 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 +do_parse_ofp10_actions(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) +{ + struct ds in; + + ds_init(&in); + while (!ds_get_preprocessed_line(&in, stdin)) { + 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 = of10_in.size; + error = ofpacts_pull_openflow(&of10_in, of10_in.size, &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); + ofpacts_format(ofpacts.data, ofpacts.size, &s); + puts(ds_cstr(&s)); + ds_destroy(&s); + + /* Convert back to ofp10 actions and print differences from input. */ + ofpbuf_init(&of10_out, 0); + ofpacts_to_openflow(ofpacts.data, ofpacts.size, &of10_out); + + print_differences(of10_in.data, of10_in.size, + of10_out.data, of10_out.size); + putchar('\n'); + + ofpbuf_uninit(&ofpacts); + ofpbuf_uninit(&of10_in); + ofpbuf_uninit(&of10_out); + } + ds_destroy(&in); +} + +/* "parse-ofp11-match": reads a series of ofp11_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. */ +static void +do_parse_ofp11_match(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) +{ + struct ds in; + + ds_init(&in); + while (!ds_get_preprocessed_line(&in, stdin)) { + struct ofpbuf match_in; + struct ofp11_match match_out; + struct cls_rule rule; + enum ofperr error; + int i; + + /* 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 (match_in.size != sizeof(struct ofp11_match)) { + ovs_fatal(0, "Input is %zu bytes, expected %zu", + match_in.size, sizeof(struct ofp11_match)); + } + + /* Convert to cls_rule. */ + error = ofputil_cls_rule_from_ofp11_match(match_in.data, + OFP_DEFAULT_PRIORITY, &rule); + if (error) { + printf("bad ofp11_match: %s\n\n", ofperr_get_name(error)); + ofpbuf_uninit(&match_in); + continue; + } + + /* Print cls_rule. */ + cls_rule_print(&rule); + + /* Convert back to ofp11_match and print differences from input. */ + ofputil_cls_rule_to_ofp11_match(&rule, &match_out); + + for (i = 0; i < sizeof match_out; i++) { + uint8_t in = ((const uint8_t *) match_in.data)[i]; + uint8_t out = ((const uint8_t *) &match_out)[i]; + + if (in != out) { + printf("%2d: %02"PRIx8" -> %02"PRIx8"\n", i, in, out); + } + } + putchar('\n'); + + ofpbuf_uninit(&match_in); + } + ds_destroy(&in); +} + +/* "print-error ENUM": Prints the type and code of ENUM for every OpenFlow + * version. */ +static void +do_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 struct ofperr_domain *domain; + + domain = ofperr_domain_from_version(version); + if (!domain) { + continue; + } + + printf("%s: %d,%d\n", + ofperr_domain_get_name(domain), + ofperr_get_type(error, domain), + ofperr_get_code(error, domain)); + } +} + /* "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). */ @@ -1884,6 +2194,7 @@ static const struct command all_commands[] = { { "diff-flows", 2, 2, do_diff_flows }, { "packet-out", 4, INT_MAX, do_packet_out }, { "dump-ports", 1, 2, do_dump_ports }, + { "dump-ports-desc", 1, 1, do_dump_ports_desc }, { "mod-port", 3, 3, do_mod_port }, { "get-frags", 1, 1, do_get_frags }, { "set-frags", 2, 2, do_set_frags }, @@ -1895,7 +2206,12 @@ static const struct command all_commands[] = { /* 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 }, + { "parse-nx-match", 0, 0, do_parse_nxm }, + { "parse-nxm", 0, 0, do_parse_nxm }, + { "parse-oxm", 0, 0, do_parse_oxm }, + { "parse-ofp10-actions", 0, 0, do_parse_ofp10_actions }, + { "parse-ofp11-match", 0, 0, do_parse_ofp11_match }, + { "print-error", 1, 1, do_print_error }, { "ofp-print", 1, 2, do_ofp_print }, { NULL, 0, 0, NULL },