X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-ofctl.c;h=86c0a859b11bda7de1dbbf3ac42f0e45c32c1eb9;hb=e0edde6fee279cdbbf3c179f5f50adaf0c7c7f1e;hp=c565e8640a76f200d20eb863be937b096b997b16;hpb=0c3d5fc89a341d31774f24ddaf7360a5ba4a641f;p=sliver-openvswitch.git diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c index c565e8640..86c0a859b 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. @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -66,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 @@ -78,6 +79,10 @@ static int preferred_packet_in_format = -1; /* -m, --more: Additional verbosity for ofp-print functions. */ static int verbosity; +/* --timestamp: Print a timestamp before each received packet on "monitor" and + * "snoop" command? */ +static bool timestamp; + static const struct command all_commands[]; static void usage(void) NO_RETURN; @@ -99,6 +104,7 @@ parse_options(int argc, char *argv[]) enum { OPT_STRICT = UCHAR_MAX + 1, OPT_READD, + OPT_TIMESTAMP, DAEMON_OPTION_ENUMS, VLOG_OPTION_ENUMS }; @@ -109,6 +115,7 @@ parse_options(int argc, char *argv[]) {"flow-format", required_argument, NULL, 'F'}, {"packet-in-format", required_argument, NULL, 'P'}, {"more", no_argument, NULL, 'm'}, + {"timestamp", no_argument, NULL, OPT_TIMESTAMP}, {"help", no_argument, NULL, 'h'}, {"version", no_argument, NULL, 'V'}, DAEMON_LONG_OPTIONS, @@ -139,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; @@ -161,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: @@ -172,6 +179,10 @@ parse_options(int argc, char *argv[]) readd = true; break; + case OPT_TIMESTAMP: + timestamp = true; + break; + DAEMON_OPTION_HANDLERS VLOG_OPTION_HANDLERS STREAM_SSL_OPTION_HANDLERS @@ -230,6 +241,7 @@ 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" " -h, --help display this help message\n" " -V, --version display version information\n"); @@ -242,7 +254,7 @@ 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, ...) @@ -265,17 +277,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); @@ -287,7 +301,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); @@ -305,9 +319,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); @@ -318,7 +340,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; @@ -341,6 +363,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); } @@ -488,19 +511,20 @@ 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 +/* 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 * '*oppp'. */ static void -fetch_ofp_phy_port(const char *vconn_name, const char *port_name, - struct ofp_phy_port *oppp) +fetch_ofputil_phy_port(const char *vconn_name, const char *port_name, + struct ofputil_phy_port *pp) { + 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; + enum ofperr error; + struct ofpbuf b; /* Try to interpret the argument as a port number. */ if (!str_to_uint(port_name, 10, &port_no)) { @@ -517,15 +541,16 @@ fetch_ofp_phy_port(const char *vconn_name, const char *port_name, 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]; + 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_switch_features_port(&b, pp)) { if (port_no != UINT_MAX - ? htons(port_no) == opp->port_no - : !strncmp(opp->name, port_name, sizeof opp->name)) { - *oppp = *opp; + ? port_no == pp->port_no + : !strcmp(pp->name, port_name)) { ofpbuf_delete(reply); vconn_close(vconn); return; @@ -544,95 +569,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); } @@ -673,122 +685,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->actions); } 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 @@ -831,9 +831,132 @@ 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 (msg->size < sizeof(struct ofp_header)) { + ofpbuf_delete(msg); + return "Message too short for OpenFlow"; + } + + oh = msg->data; + if (msg->size != 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, msg->data, msg->size, verbosity); + + error = vconn_send_block(vconn, msg); + if (error) { + ofpbuf_delete(msg); + ds_put_format(&reply, "%s\n", 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(); + error = vconn_send_block(aux->vconn, msg); + if (error) { + ofpbuf_delete(msg); + unixctl_command_reply_error(conn, 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, strerror(errno)); + return; + } + + fflush(stderr); + dup2(fd, STDERR_FILENO); + close(fd); + unixctl_command_reply(conn, NULL); +} + static void monitor_vconn(struct vconn *vconn) { + struct barrier_aux barrier_aux = { vconn, NULL }; struct unixctl_server *server; bool exiting = false; int error; @@ -845,6 +968,12 @@ monitor_vconn(struct vconn *vconn) ovs_fatal(error, "failed to create unixctl server"); } unixctl_command_register("exit", "", 0, 0, ofctl_exit, &exiting); + 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); daemonize_complete(); for (;;) { @@ -854,14 +983,30 @@ monitor_vconn(struct vconn *vconn) unixctl_server_run(server); for (;;) { + uint8_t msg_type; + retval = vconn_recv(vconn, &b); if (retval == EAGAIN) { break; } - run(retval, "vconn_recv"); + + if (timestamp) { + time_t now = time_wall(); + char s[32]; + + strftime(s, sizeof s, "%Y-%m-%d %H:%M:%S: ", localtime(&now)); + fputs(s, stderr); + } + + msg_type = ((const struct ofp_header *) b->data)->type; ofp_print(stderr, b->data, b->size, verbosity + 2); ofpbuf_delete(b); + + if (barrier_aux.conn && msg_type == OFPT10_BARRIER_REPLY) { + unixctl_command_reply(barrier_aux.conn, NULL); + barrier_aux.conn = NULL; + } } if (exiting) { @@ -991,46 +1136,46 @@ do_packet_out(int argc, char *argv[]) ofpbuf_delete(packet); } vconn_close(vconn); + ofpbuf_uninit(&actions); } static void do_mod_port(int argc OVS_UNUSED, char *argv[]) { - struct ofp_port_mod *opm; - struct ofp_phy_port opp; - struct ofpbuf *request; + enum ofputil_protocol protocol; + struct ofputil_port_mod pm; + struct ofputil_phy_port pp; struct vconn *vconn; - fetch_ofp_phy_port(argv[1], argv[2], &opp); + fetch_ofputil_phy_port(argv[1], argv[2], &pp); - 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); + 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 (!strcasecmp(argv[3], "up")) { - opm->mask |= htonl(OFPPC_PORT_DOWN); + pm.mask |= OFPUTIL_PC_PORT_DOWN; } else if (!strcasecmp(argv[3], "down")) { - opm->mask |= htonl(OFPPC_PORT_DOWN); - opm->config |= htonl(OFPPC_PORT_DOWN); + pm.mask |= OFPUTIL_PC_PORT_DOWN; + pm.config |= OFPUTIL_PC_PORT_DOWN; } else if (!strcasecmp(argv[3], "flood")) { - opm->mask |= htonl(OFPPC_NO_FLOOD); + pm.mask |= OFPUTIL_PC_NO_FLOOD; } else if (!strcasecmp(argv[3], "noflood")) { - opm->mask |= htonl(OFPPC_NO_FLOOD); - opm->config |= htonl(OFPPC_NO_FLOOD); + pm.mask |= OFPUTIL_PC_NO_FLOOD; + pm.config |= OFPUTIL_PC_NO_FLOOD; } else if (!strcasecmp(argv[3], "forward")) { - opm->mask |= htonl(OFPPC_NO_FWD); + pm.mask |= OFPUTIL_PC_NO_FWD; } else if (!strcasecmp(argv[3], "noforward")) { - opm->mask |= htonl(OFPPC_NO_FWD); - opm->config |= htonl(OFPPC_NO_FWD); + pm.mask |= OFPUTIL_PC_NO_FWD; + pm.config |= OFPUTIL_PC_NO_FWD; } else { ovs_fatal(0, "unknown mod-port command '%s'", argv[3]); } - open_vconn(argv[1], &vconn); - transact_noreply(vconn, request); + protocol = open_vconn(argv[1], &vconn); + transact_noreply(vconn, ofputil_encode_port_mod(&pm, protocol)); vconn_close(vconn); } @@ -1270,6 +1415,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 @@ -1296,12 +1442,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; @@ -1311,11 +1457,10 @@ 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); @@ -1327,9 +1472,7 @@ read_flows_from_file(const char *filename, struct classifier *cls, int index) version->actions = fm.actions; version->n_actions = fm.n_actions; - 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); } @@ -1339,14 +1482,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; @@ -1359,7 +1503,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); @@ -1423,7 +1567,7 @@ 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; @@ -1447,7 +1591,7 @@ fte_make_flow_mod(const struct fte *fte, int index, uint16_t command, fm.n_actions = 0; } - ofm = ofputil_encode_flow_mod(&fm, flow_format, false); + ofm = ofputil_encode_flow_mod(&fm, protocol); list_push_back(packets, &ofm->list_node); } @@ -1455,7 +1599,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; @@ -1463,11 +1607,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); @@ -1479,7 +1624,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); } } @@ -1492,8 +1637,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); @@ -1511,12 +1655,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); } } @@ -1564,14 +1708,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->actions); } } @@ -1580,20 +1750,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 @@ -1601,28 +1761,12 @@ 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 @@ -1691,6 +1835,34 @@ do_parse_nx_match(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) 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). */ @@ -1736,6 +1908,7 @@ static const struct command all_commands[] = { { "parse-flow", 1, 1, do_parse_flow }, { "parse-flows", 1, 1, do_parse_flows }, { "parse-nx-match", 0, 0, do_parse_nx_match }, + { "print-error", 1, 1, do_print_error }, { "ofp-print", 1, 2, do_ofp_print }, { NULL, 0, 0, NULL },