X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-ofctl.c;h=35a2ca749aac3c3ee91c2843402e5e8ae6e4269b;hb=7aaeab4df24b7e9460705b1dad1010eef0354c50;hp=a0b70793b93413a247491aa3ffde5c1de308d75a;hpb=64626975103668a5662622819536780ba87bef79;p=sliver-openvswitch.git diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c index a0b70793b..35a2ca749 100644 --- a/utilities/ovs-ofctl.c +++ b/utilities/ovs-ofctl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc. + * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,6 +44,7 @@ #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" @@ -52,6 +53,7 @@ #include "poll-loop.h" #include "random.h" #include "stream-ssl.h" +#include "socket-util.h" #include "timeval.h" #include "unixctl.h" #include "util.h" @@ -96,7 +98,7 @@ struct sort_criterion { static struct sort_criterion *criteria; static size_t n_criteria, allocated_criteria; -static const struct command all_commands[]; +static const struct command *get_all_commands(void); static void usage(void) NO_RETURN; static void parse_options(int argc, char *argv[]); @@ -111,7 +113,7 @@ 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); + run_command(argc - optind, argv + optind, get_all_commands()); return 0; } @@ -146,9 +148,10 @@ parse_options(int argc, char *argv[]) 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}, @@ -159,13 +162,15 @@ parse_options(int argc, char *argv[]) {"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 (;;) { unsigned long int timeout; @@ -209,10 +214,6 @@ parse_options(int argc, char *argv[]) case 'h': usage(); - case 'V': - ovs_print_version(OFP10_VERSION, OFP10_VERSION); - exit(EXIT_SUCCESS); - case OPT_STRICT: strict = true; break; @@ -234,6 +235,7 @@ parse_options(int argc, char *argv[]) break; DAEMON_OPTION_HANDLERS + OFP_VERSION_OPTION_HANDLERS VLOG_OPTION_HANDLERS STREAM_SSL_OPTION_HANDLERS @@ -251,6 +253,22 @@ parse_options(int argc, char *argv[]) } 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 @@ -287,10 +305,13 @@ usage(void) " 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", 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" @@ -319,7 +340,8 @@ ofctl_exit(struct unixctl_conn *conn, int argc OVS_UNUSED, 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; @@ -331,54 +353,70 @@ 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, OFP10_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; } +enum open_target { MGMT, SNOOP }; + static enum ofputil_protocol -open_vconn__(const char *name, const char *default_suffix, +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; int ofp_version; - struct stat s; + 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, OFP10_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); + 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) { @@ -391,7 +429,7 @@ open_vconn__(const char *name, const char *default_suffix, static enum ofputil_protocol open_vconn(const char *name, struct vconn **vconnp) { - return open_vconn__(name, "mgmt", vconnp); + return open_vconn__(name, MGMT, vconnp); } static void @@ -402,25 +440,27 @@ send_openflow_buffer(struct vconn *vconn, struct ofpbuf *buffer) } 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; ofpmsg_update_length(request); - open_vconn(vconn_name, &vconn); - run(vconn_transact(vconn, request, &reply), "talking to %s", vconn_name); + run(vconn_transact(vconn, request, &reply), "talking to %s", + vconn_get_name(vconn)); ofp_print(stdout, reply->data, reply->size, verbosity + 1); ofpbuf_delete(reply); - vconn_close(vconn); } static void dump_trivial_transaction(const char *vconn_name, enum ofpraw raw) { struct ofpbuf *request; - request = ofpraw_alloc(raw, OFP10_VERSION, 0); - 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 @@ -478,9 +518,9 @@ dump_trivial_stats_transaction(const char *vconn_name, enum ofpraw raw) 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 @@ -524,7 +564,8 @@ fetch_switch_config(struct vconn *vconn, struct ofp_switch_config *config_) struct ofpbuf *reply; enum ofptype type; - request = ofpraw_alloc(OFPRAW_OFPT_GET_CONFIG_REQUEST, OFP10_VERSION, 0); + 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)); @@ -543,7 +584,7 @@ set_switch_config(struct vconn *vconn, const struct ofp_switch_config *config) { struct ofpbuf *request; - request = ofpraw_alloc(OFPRAW_OFPT_SET_CONFIG, OFP10_VERSION, 0); + request = ofpraw_alloc(OFPRAW_OFPT_SET_CONFIG, vconn_get_version(vconn), 0); ofpbuf_put(request, config, sizeof *config); transact_noreply(vconn, request); @@ -558,15 +599,15 @@ ofctl_show(int argc OVS_UNUSED, char *argv[]) struct ofpbuf *reply; bool trunc; - request = ofpraw_alloc(OFPRAW_OFPT_FEATURES_REQUEST, OFP10_VERSION, 0); 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, 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 @@ -576,6 +617,7 @@ ofctl_show(int argc OVS_UNUSED, char *argv[]) OFPRAW_OFPST_PORT_DESC_REQUEST); } dump_trivial_transaction(vconn_name, OFPRAW_OFPT_GET_CONFIG_REQUEST); + vconn_close(vconn); } static void @@ -592,7 +634,7 @@ ofctl_dump_tables(int argc OVS_UNUSED, char *argv[]) static bool fetch_port_by_features(const char *vconn_name, - const char *port_name, unsigned int port_no, + const char *port_name, ofp_port_t port_no, struct ofputil_phy_port *pp, bool *trunc) { struct ofputil_switch_features features; @@ -605,8 +647,9 @@ fetch_port_by_features(const char *vconn_name, bool found = false; /* Fetch the switch's ofp_switch_features. */ - request = ofpraw_alloc(OFPRAW_OFPT_FEATURES_REQUEST, OFP10_VERSION, 0); 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); @@ -629,7 +672,7 @@ fetch_port_by_features(const char *vconn_name, } while (!ofputil_pull_phy_port(oh->version, &b, pp)) { - if (port_no != UINT_MAX + if (port_no != OFPP_NONE ? port_no == pp->port_no : !strcmp(pp->name, port_name)) { found = true; @@ -644,7 +687,7 @@ exit: static bool fetch_port_by_stats(const char *vconn_name, - const char *port_name, unsigned int port_no, + const char *port_name, ofp_port_t port_no, struct ofputil_phy_port *pp) { struct ofpbuf *request; @@ -688,8 +731,8 @@ fetch_port_by_stats(const char *vconn_name, } while (!ofputil_pull_phy_port(oh->version, &b, pp)) { - if (port_no != UINT_MAX ? port_no == pp->port_no - : !strcmp(pp->name, port_name)) { + if (port_no != OFPP_NONE ? port_no == pp->port_no + : !strcmp(pp->name, port_name)) { found = true; break; } @@ -705,6 +748,16 @@ fetch_port_by_stats(const char *vconn_name, 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 @@ -713,13 +766,13 @@ static void fetch_ofputil_phy_port(const char *vconn_name, const char *port_name, struct ofputil_phy_port *pp) { - unsigned int port_no; + ofp_port_t 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; + 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 @@ -738,11 +791,12 @@ fetch_ofputil_phy_port(const char *vconn_name, const char *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) { - uint16_t port_no = ofputil_port_from_string(port_name); - if (port_no) { + ofp_port_t port_no; + + if (ofputil_port_from_string(port_name, &port_no)) { return port_no; } else { struct ofputil_phy_port pp; @@ -762,7 +816,7 @@ try_set_protocol(struct vconn *vconn, enum ofputil_protocol want, request = ofputil_encode_set_protocol(*cur, want, &next); if (!request) { - return true; + return *cur == want; } run(vconn_transact_noreply(vconn, request, &reply), @@ -814,8 +868,14 @@ prepare_dump_flows(int argc, char *argv[], bool aggregate, enum ofputil_protocol usable_protocols, protocol; struct ofputil_flow_stats_request fsr; struct vconn *vconn; + char *error; + + error = parse_ofp_flow_stats_request_str(&fsr, aggregate, + argc > 2 ? argv[2] : ""); + if (error) { + ovs_fatal(0, "%s", error); + } - parse_ofp_flow_stats_request_str(&fsr, aggregate, argc > 2 ? argv[2] : ""); usable_protocols = ofputil_flow_stats_request_usable_protocols(&fsr); protocol = open_vconn(argv[1], &vconn); @@ -957,7 +1017,7 @@ ofctl_queue_stats(int argc, char *argv[]) if (argc > 2 && argv[2][0] && strcasecmp(argv[2], "all")) { oqs.port_no = str_to_port_no(argv[1], argv[2]); } else { - oqs.port_no = OFPP_ALL; + oqs.port_no = OFPP_ANY; } if (argc > 3 && argv[3][0] && strcasecmp(argv[3], "all")) { oqs.queue_id = atoi(argv[3]); @@ -1035,8 +1095,12 @@ ofctl_flow_mod_file(int argc OVS_UNUSED, char *argv[], uint16_t command) { struct ofputil_flow_mod *fms = NULL; size_t n_fms = 0; + char *error; - parse_ofp_flow_mod_file(argv[2], command, &fms, &n_fms); + error = parse_ofp_flow_mod_file(argv[2], command, &fms, &n_fms); + if (error) { + ovs_fatal(0, "%s", error); + } ofctl_flow_mod__(argv[1], fms, n_fms); free(fms); } @@ -1048,7 +1112,12 @@ ofctl_flow_mod(int argc, char *argv[], uint16_t command) ofctl_flow_mod_file(argc, argv, command); } else { struct ofputil_flow_mod fm; - parse_ofp_flow_mod_str(&fm, argc > 2 ? argv[2] : "", command, false); + char *error; + + error = parse_ofp_flow_mod_str(&fm, argc > 2 ? argv[2] : "", command); + if (error) { + ovs_fatal(0, "%s", error); + } ofctl_flow_mod__(argv[1], &fm, 1); } } @@ -1181,7 +1250,7 @@ ofctl_send(struct unixctl_conn *conn, int argc, error = vconn_send_block(vconn, msg); if (error) { ofpbuf_delete(msg); - ds_put_format(&reply, "%s\n", strerror(error)); + ds_put_format(&reply, "%s\n", ovs_strerror(error)); ok = false; } else { ds_put_cstr(&reply, "sent\n"); @@ -1218,7 +1287,7 @@ ofctl_barrier(struct unixctl_conn *conn, int argc OVS_UNUSED, error = vconn_send_block(aux->vconn, msg); if (error) { ofpbuf_delete(msg); - unixctl_command_reply_error(conn, strerror(error)); + unixctl_command_reply_error(conn, ovs_strerror(error)); } else { aux->conn = conn; } @@ -1232,7 +1301,7 @@ ofctl_set_output_file(struct unixctl_conn *conn, int argc OVS_UNUSED, fd = open(argv[1], O_CREAT | O_TRUNC | O_WRONLY, 0666); if (fd < 0) { - unixctl_command_reply_error(conn, strerror(errno)); + unixctl_command_reply_error(conn, ovs_strerror(errno)); return; } @@ -1270,8 +1339,12 @@ ofctl_unblock(struct unixctl_conn *conn, int argc OVS_UNUSED, } } +/* 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; @@ -1315,21 +1388,35 @@ monitor_vconn(struct vconn *vconn) run(retval, "vconn_recv"); if (timestamp) { - time_t now = time_wall(); - char s[32]; - - strftime(s, sizeof s, "%Y-%m-%d %H:%M:%S: ", gmtime(&now)); + char *s = xastrftime("%Y-%m-%d %H:%M:%S: ", time_wall(), true); fputs(s, stderr); + free(s); } ofptype_decode(&type, b->data); ofp_print(stderr, b->data, b->size, verbosity + 2); - ofpbuf_delete(b); - if (barrier_aux.conn && type == OFPTYPE_BARRIER_REPLY) { - unixctl_command_reply(barrier_aux.conn, NULL); - barrier_aux.conn = NULL; + 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(b->data); + retval = vconn_send_block(vconn, reply); + if (retval) { + ovs_fatal(retval, "failed to send echo reply"); + } + } + break; } + ofpbuf_delete(b); } if (exiting) { @@ -1369,8 +1456,12 @@ ofctl_monitor(int argc, char *argv[]) } else if (!strncmp(arg, "watch:", 6)) { struct ofputil_flow_monitor_request fmr; struct ofpbuf *msg; + char *error; - parse_flow_monitor_request(&fmr, arg + 6); + error = parse_flow_monitor_request(&fmr, arg + 6); + if (error) { + ovs_fatal(0, "%s", error); + } msg = ofpbuf_new(0); ofputil_append_flow_monitor_request(&fmr, msg); @@ -1383,23 +1474,36 @@ ofctl_monitor(int argc, char *argv[]) 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(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(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(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); + } + break; + } + case OFP11_VERSION: + case OFP12_VERSION: + case OFP13_VERSION: + break; + default: + NOT_REACHED(); } } - monitor_vconn(vconn); + monitor_vconn(vconn, true); } static void @@ -1407,8 +1511,8 @@ 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 @@ -1416,10 +1520,10 @@ ofctl_dump_ports(int argc, char *argv[]) { struct ofpbuf *request; struct vconn *vconn; - uint16_t port; + ofp_port_t port; open_vconn(argv[1], &vconn); - port = argc > 2 ? str_to_port_no(argv[1], argv[2]) : OFPP_NONE; + 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); @@ -1455,10 +1559,14 @@ ofctl_packet_out(int argc, char *argv[]) struct ofputil_packet_out po; struct ofpbuf ofpacts; struct vconn *vconn; + char *error; int i; ofpbuf_init(&ofpacts, 64); - parse_ofpacts(argv[3], &ofpacts); + error = parse_ofpacts(argv[3], &ofpacts); + if (error) { + ovs_fatal(0, "%s", error); + } po.buffer_id = UINT32_MAX; po.in_port = str_to_port_no(argv[1], argv[2]); @@ -1590,6 +1698,56 @@ ofctl_set_frags(int argc OVS_UNUSED, char *argv[]) vconn_close(vconn); } +static void +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: %zu-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, b.data, b.size, verbosity + 2); + } + ofpbuf_uninit(&b); + + if (file != stdin) { + fclose(file); + } +} + static void ofctl_ping(int argc, char *argv[]) { @@ -1610,8 +1768,8 @@ ofctl_ping(int argc, char *argv[]) const struct ofp_header *rpy_hdr; enum ofptype type; - request = ofpraw_alloc(OFPRAW_OFPT_ECHO_REQUEST, OFP10_VERSION, - payload); + request = ofpraw_alloc(OFPRAW_OFPT_ECHO_REQUEST, + vconn_get_version(vconn), payload); random_bytes(ofpbuf_put_uninit(request, payload), payload); xgettimeofday(&start); @@ -1665,8 +1823,8 @@ ofctl_benchmark(int argc OVS_UNUSED, char *argv[]) for (i = 0; i < count; i++) { struct ofpbuf *request, *reply; - request = ofpraw_alloc(OFPRAW_OFPT_ECHO_REQUEST, OFP10_VERSION, - 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); @@ -1822,6 +1980,7 @@ static enum ofputil_protocol read_flows_from_file(const char *filename, struct classifier *cls, int index) { enum ofputil_protocol usable_protocols; + int line_number; struct ds s; FILE *file; @@ -1832,11 +1991,16 @@ read_flows_from_file(const char *filename, struct classifier *cls, int index) ds_init(&s); usable_protocols = OFPUTIL_P_ANY; - while (!ds_get_preprocessed_line(&s, file)) { + line_number = 0; + while (!ds_get_preprocessed_line(&s, file, &line_number)) { struct fte_version *version; struct ofputil_flow_mod fm; + char *error; - parse_ofp_str(&fm, OFPFC_ADD, ds_cstr(&s), true); + error = parse_ofp_str(&fm, OFPFC_ADD, ds_cstr(&s)); + if (error) { + ovs_fatal(0, "%s:%d: %s", filename, line_number, error); + } version = xmalloc(sizeof *version); version->cookie = fm.new_cookie; @@ -1929,7 +2093,7 @@ read_flows_from_switch(struct vconn *vconn, fsr.aggregate = false; match_init_catchall(&fsr.match); - fsr.out_port = OFPP_NONE; + fsr.out_port = OFPP_ANY; fsr.table_id = 0xff; fsr.cookie = fsr.cookie_mask = htonll(0); request = ofputil_encode_flow_stats_request(&fsr, protocol); @@ -1967,12 +2131,13 @@ fte_make_flow_mod(const struct fte *fte, int index, uint16_t command, 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) { @@ -2127,7 +2292,7 @@ ofctl_parse_flows__(struct ofputil_flow_mod *fms, size_t n_fms) break; } } - assert(IS_POW2(protocol)); + ovs_assert(is_pow2(protocol)); printf("chosen protocol: %s\n", ofputil_protocol_to_string(protocol)); @@ -2149,8 +2314,12 @@ static void ofctl_parse_flow(int argc OVS_UNUSED, char *argv[]) { struct ofputil_flow_mod fm; + char *error; - parse_ofp_flow_mod_str(&fm, argv[1], OFPFC_ADD, false); + error = parse_ofp_flow_mod_str(&fm, argv[1], OFPFC_ADD); + if (error) { + ovs_fatal(0, "%s", error); + } ofctl_parse_flows__(&fm, 1); } @@ -2161,8 +2330,12 @@ ofctl_parse_flows(int argc OVS_UNUSED, char *argv[]) { struct ofputil_flow_mod *fms = NULL; size_t n_fms = 0; + char *error; - parse_ofp_flow_mod_file(argv[1], OFPFC_ADD, &fms, &n_fms); + error = parse_ofp_flow_mod_file(argv[1], OFPFC_ADD, &fms, &n_fms); + if (error) { + ovs_fatal(0, "%s", error); + } ofctl_parse_flows__(fms, n_fms); free(fms); } @@ -2214,7 +2387,7 @@ ofctl_parse_nxm__(bool oxm) ofpbuf_init(&nx_match, 0); if (oxm) { match_len = oxm_put_match(&nx_match, &match); - out = oxm_match_to_string(nx_match.data, match_len); + out = oxm_match_to_string(&nx_match, match_len); } else { match_len = nx_put_match(&nx_match, &match, cookie, cookie_mask); @@ -2284,7 +2457,7 @@ 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)) { + while (!ds_get_preprocessed_line(&in, stdin, NULL)) { struct ofpbuf of10_out; struct ofpbuf of10_in; struct ofpbuf ofpacts; @@ -2348,7 +2521,7 @@ ofctl_parse_ofp10_match(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) ds_init(&in); ds_init(&expout); - while (!ds_get_preprocessed_line(&in, stdin)) { + while (!ds_get_preprocessed_line(&in, stdin, NULL)) { struct ofpbuf match_in, match_expout; struct ofp10_match match_out; struct ofp10_match match_normal; @@ -2420,7 +2593,7 @@ 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)) { + while (!ds_get_preprocessed_line(&in, stdin, NULL)) { struct ofpbuf match_in; struct ofp11_match match_out; struct match match; @@ -2469,7 +2642,7 @@ 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)) { + while (!ds_get_preprocessed_line(&in, stdin, NULL)) { struct ofpbuf of11_out; struct ofpbuf of11_in; struct ofpbuf ofpacts; @@ -2527,17 +2700,27 @@ 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)) { + 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, ds_cstr(&in), NULL)[0] != '\0') { + if (ofpbuf_put_hex(&of11_in, instructions, NULL)[0] != '\0') { ovs_fatal(0, "Trailing garbage in hex data"); } @@ -2546,6 +2729,13 @@ ofctl_parse_ofp11_instructions(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) size = of11_in.size; error = ofpacts_pull_openflow11_instructions(&of11_in, of11_in.size, &ofpacts); + if (!error) { + /* Verify actions. */ + struct flow flow; + memset(&flow, 0, sizeof flow); + error = ofpacts_check(ofpacts.data, ofpacts.size, &flow, OFPP_MAX, + table_id ? atoi(table_id) : 0); + } if (error) { printf("bad OF1.1 instructions: %s\n\n", ofperr_get_name(error)); ofpbuf_uninit(&ofpacts); @@ -2599,6 +2789,7 @@ ofctl_check_vlan(int argc OVS_UNUSED, char *argv[]) struct match of11_match; enum ofperr error; + char *error_s; match_init_catchall(&match); match.flow.vlan_tci = htons(strtoul(argv[1], NULL, 16)); @@ -2608,7 +2799,10 @@ ofctl_check_vlan(int argc OVS_UNUSED, char *argv[]) string_s = match_to_string(&match, OFP_DEFAULT_PRIORITY); printf("%s -> ", string_s); fflush(stdout); - parse_ofp_str(&fm, -1, string_s, false); + error_s = parse_ofp_str(&fm, -1, string_s); + 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)); @@ -2633,7 +2827,7 @@ ofctl_check_vlan(int argc OVS_UNUSED, char *argv[]) /* Convert to and from OXM. */ ofpbuf_init(&nxm, 0); nxm_match_len = oxm_put_match(&nxm, &match); - nxm_s = oxm_match_to_string(nxm.data, nxm_match_len); + nxm_s = oxm_match_to_string(&nxm, nxm_match_len); error = oxm_pull_match(&nxm, &nxm_match); printf("OXM: %s -> ", nxm_s); if (error) { @@ -2692,16 +2886,53 @@ ofctl_print_error(int argc OVS_UNUSED, char *argv[]) for (version = 0; version <= UINT8_MAX; version++) { const char *name = ofperr_domain_get_name(version); - if (!name) { - continue; + 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); + } } - printf("%s: %d,%d\n", - ofperr_domain_get_name(version), - ofperr_get_type(error, version), - ofperr_get_code(error, version)); } } +/* "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 (request.size < sizeof(struct ofp_header)) { + ovs_fatal(0, "Request too short"); + } + + oh = request.data; + if (request.size != ntohs(oh->length)) { + ovs_fatal(0, "Request size inconsistent"); + } + + reply = ofperr_encode_reply(error, request.data); + ofpbuf_uninit(&request); + + ovs_hex_dump(stdout, reply->data, reply->size, 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). */ @@ -2718,6 +2949,20 @@ ofctl_ofp_print(int argc, char *argv[]) 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, hello->data, hello->size, 0, false); + ofp_print(stdout, hello->data, hello->size, verbosity); + ofpbuf_delete(hello); +} + static const struct command all_commands[] = { { "show", 1, 1, ofctl_show }, { "monitor", 1, 3, ofctl_monitor }, @@ -2739,6 +2984,7 @@ static const struct command all_commands[] = { { "mod-port", 3, 3, ofctl_mod_port }, { "get-frags", 1, 1, ofctl_get_frags }, { "set-frags", 2, 2, ofctl_set_frags }, + { "ofp-parse", 1, 1, ofctl_ofp_parse }, { "probe", 1, 1, ofctl_probe }, { "ping", 1, 2, ofctl_ping }, { "benchmark", 3, 3, ofctl_benchmark }, @@ -2757,7 +3003,14 @@ static const struct command all_commands[] = { { "parse-ofp11-instructions", 0, 0, ofctl_parse_ofp11_instructions }, { "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; +}