X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-ofctl.c;h=9f5a0a524f12640a06d930f74b7f3522a210d86c;hb=99620d2c1b01045a652d586da3c46608f7c59eda;hp=ec8a0e1e55e005c584d071b73cf0f19eec5e100c;hpb=d65349ea28bb67a0062a9b4b60ff97538206373b;p=sliver-openvswitch.git diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c index ec8a0e1e5..9f5a0a524 100644 --- a/utilities/ovs-ofctl.c +++ b/utilities/ovs-ofctl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,130 +15,87 @@ */ #include -#include #include #include #include #include -#include #include -#include #include #include #include #include #include +#include "byte-order.h" +#include "classifier.h" #include "command-line.h" #include "compiler.h" #include "dirs.h" #include "dpif.h" #include "dynamic-string.h" -#include "netdev.h" #include "netlink.h" +#include "nx-match.h" #include "odp-util.h" +#include "ofp-parse.h" #include "ofp-print.h" +#include "ofp-util.h" #include "ofpbuf.h" #include "openflow/nicira-ext.h" #include "openflow/openflow.h" -#include "packets.h" #include "random.h" -#include "socket-util.h" +#include "stream-ssl.h" #include "timeval.h" #include "util.h" -#include "vconn-ssl.h" #include "vconn.h" - #include "vlog.h" -#define THIS_MODULE VLM_ofctl -#define DEFAULT_IDLE_TIMEOUT 60 +VLOG_DEFINE_THIS_MODULE(ofctl); -#define MOD_PORT_CMD_UP "up" -#define MOD_PORT_CMD_DOWN "down" -#define MOD_PORT_CMD_FLOOD "flood" -#define MOD_PORT_CMD_NOFLOOD "noflood" +/* --strict: Use strict matching for flow mod commands? */ +static bool strict; +/* -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; -/* Settings that may be configured by the user. */ -struct settings { - bool strict; /* Use strict matching for flow mod commands */ -}; +/* -m, --more: Additional verbosity for ofp-print functions. */ +static int verbosity; -struct command { - const char *name; - int min_args; - int max_args; - void (*handler)(const struct settings *, int argc, char *argv[]); -}; - -static struct command all_commands[]; +static const struct command all_commands[]; static void usage(void) NO_RETURN; -static void parse_options(int argc, char *argv[], struct settings *); +static void parse_options(int argc, char *argv[]); -int main(int argc, char *argv[]) +int +main(int argc, char *argv[]) { - struct settings s; - struct command *p; - set_program_name(argv[0]); - time_init(); - vlog_init(); - parse_options(argc, argv, &s); + parse_options(argc, argv); signal(SIGPIPE, SIG_IGN); - - argc -= optind; - argv += optind; - if (argc < 1) - ovs_fatal(0, "missing command name; use --help for help"); - - for (p = all_commands; p->name != NULL; p++) { - if (!strcmp(p->name, argv[0])) { - int n_arg = argc - 1; - if (n_arg < p->min_args) - ovs_fatal(0, "'%s' command requires at least %d arguments", - p->name, p->min_args); - else if (n_arg > p->max_args) - ovs_fatal(0, "'%s' command takes at most %d arguments", - p->name, p->max_args); - else { - p->handler(&s, argc, argv); - if (ferror(stdout)) { - ovs_fatal(0, "write to stdout failed"); - } - if (ferror(stderr)) { - ovs_fatal(0, "write to stderr failed"); - } - exit(0); - } - } - } - ovs_fatal(0, "unknown command '%s'; use --help for help", argv[0]); - + run_command(argc - optind, argv + optind, all_commands); return 0; } static void -parse_options(int argc, char *argv[], struct settings *s) +parse_options(int argc, char *argv[]) { enum { - OPT_STRICT = UCHAR_MAX + 1 + OPT_STRICT = UCHAR_MAX + 1, + VLOG_OPTION_ENUMS }; static struct option long_options[] = { {"timeout", required_argument, 0, 't'}, - {"verbose", optional_argument, 0, 'v'}, {"strict", no_argument, 0, OPT_STRICT}, + {"flow-format", required_argument, 0, 'F'}, + {"more", no_argument, 0, 'm'}, {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'V'}, - VCONN_SSL_LONG_OPTIONS + VLOG_LONG_OPTIONS, + STREAM_SSL_LONG_OPTIONS {0, 0, 0, 0}, }; char *short_options = long_options_to_short_options(long_options); - /* Set defaults that we can figure out before parsing options. */ - s->strict = false; - for (;;) { unsigned long int timeout; int c; @@ -159,6 +116,17 @@ parse_options(int argc, char *argv[], struct settings *s) } 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); + } + break; + + case 'm': + verbosity++; + break; + case 'h': usage(); @@ -166,15 +134,12 @@ parse_options(int argc, char *argv[], struct settings *s) OVS_PRINT_VERSION(OFP_VERSION, OFP_VERSION); exit(EXIT_SUCCESS); - case 'v': - vlog_set_verbosity(optarg); - break; - case OPT_STRICT: - s->strict = true; + strict = true; break; - VCONN_SSL_OPTION_HANDLERS + VLOG_OPTION_HANDLERS + STREAM_SSL_OPTION_HANDLERS case '?': exit(EXIT_FAILURE); @@ -197,17 +162,17 @@ usage(void) " dump-desc SWITCH print switch description\n" " dump-tables SWITCH print table stats\n" " mod-port SWITCH IFACE ACT modify port behavior\n" - " dump-ports SWITCH print port statistics\n" + " dump-ports SWITCH [PORT] print port statistics\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" " dump-aggregate SWITCH FLOW print aggregate stats for FLOWs\n" + " queue-stats SWITCH [PORT [QUEUE]] dump queue stats\n" " add-flow SWITCH FLOW add flow described by FLOW\n" " add-flows SWITCH FILE add flows from FILE\n" " mod-flows SWITCH FLOW modify actions of matching FLOWs\n" " del-flows SWITCH [FLOW] delete matching FLOWs\n" - " monitor SWITCH MISSLEN EXP print packets received from SWITCH\n" - " execute SWITCH CMD [ARG...] execute CMD with ARGS on SWITCH\n" + " monitor SWITCH [MISSLEN] print packets received from SWITCH\n" "\nFor OpenFlow switches and controllers:\n" " probe VCONN probe whether VCONN is up\n" " ping VCONN [N] latency of N-byte echos\n" @@ -218,6 +183,8 @@ usage(void) vlog_usage(); printf("\nOther options:\n" " --strict use strict match for flow commands\n" + " -F, --flow-format=FORMAT force particular flow format\n" + " -m, --more be more verbose printing OpenFlow\n" " -t, --timeout=SECS give up after SECS seconds\n" " -h, --help display this help message\n" " -V, --version display version information\n"); @@ -249,33 +216,46 @@ static void run(int retval, const char *message, ...) /* Generic commands. */ static void -open_vconn(const char *name, struct vconn **vconnp) +open_vconn_socket(const char *name, struct vconn **vconnp) +{ + char *vconn_name = xasprintf("unix:%s", name); + VLOG_DBG("connecting to %s", vconn_name); + run(vconn_open_block(vconn_name, OFP_VERSION, vconnp), + "connecting to %s", vconn_name); + free(vconn_name); +} + +static void +open_vconn__(const char *name, const char *default_suffix, + struct vconn **vconnp) { struct dpif *dpif; struct stat s; + char *bridge_path, *datapath_name, *datapath_type; + + bridge_path = xasprintf("%s/%s.%s", ovs_rundir(), name, default_suffix); + dp_parse_name(name, &datapath_name, &datapath_type); if (strstr(name, ":")) { run(vconn_open_block(name, OFP_VERSION, vconnp), "connecting to %s", name); } else if (!stat(name, &s) && S_ISSOCK(s.st_mode)) { - char *vconn_name = xasprintf("unix:%s", name); - VLOG_INFO("connecting to %s", vconn_name); - run(vconn_open_block(vconn_name, OFP_VERSION, vconnp), - "connecting to %s", vconn_name); - free(vconn_name); - } else if (!dpif_open(name, &dpif)) { + open_vconn_socket(name, vconnp); + } else if (!stat(bridge_path, &s) && S_ISSOCK(s.st_mode)) { + open_vconn_socket(bridge_path, vconnp); + } else if (!dpif_open(datapath_name, datapath_type, &dpif)) { char dpif_name[IF_NAMESIZE + 1]; char *socket_name; - char *vconn_name; run(dpif_port_get_name(dpif, ODPP_LOCAL, dpif_name, sizeof dpif_name), "obtaining name of %s", dpif_name); dpif_close(dpif); if (strcmp(dpif_name, name)) { - VLOG_INFO("datapath %s is named %s", name, dpif_name); + VLOG_DBG("datapath %s is named %s", name, dpif_name); } - socket_name = xasprintf("%s/%s.mgmt", ovs_rundir, dpif_name); + socket_name = xasprintf("%s/%s.%s", + ovs_rundir(), dpif_name, default_suffix); if (stat(socket_name, &s)) { ovs_fatal(errno, "cannot connect to %s: stat failed on %s", name, socket_name); @@ -284,15 +264,21 @@ open_vconn(const char *name, struct vconn **vconnp) name, socket_name); } - vconn_name = xasprintf("unix:%s", socket_name); - VLOG_INFO("connecting to %s", vconn_name); - run(vconn_open_block(vconn_name, OFP_VERSION, vconnp), - "connecting to %s", vconn_name); + open_vconn_socket(socket_name, vconnp); free(socket_name); - free(vconn_name); } else { ovs_fatal(0, "%s is not a valid connection method", name); } + + free(datapath_name); + free(datapath_type); + free(bridge_path); +} + +static void +open_vconn(const char *name, struct vconn **vconnp) +{ + return open_vconn__(name, "mgmt", vconnp); } static void * @@ -322,7 +308,7 @@ dump_transaction(const char *vconn_name, struct ofpbuf *request) update_openflow_length(request); open_vconn(vconn_name, &vconn); run(vconn_transact(vconn, request, &reply), "talking to %s", vconn_name); - ofp_print(stdout, reply->data, reply->size, 1); + ofp_print(stdout, reply->data, reply->size, verbosity + 1); vconn_close(vconn); } @@ -337,7 +323,7 @@ dump_trivial_transaction(const char *vconn_name, uint8_t request_type) static void dump_stats_transaction(const char *vconn_name, struct ofpbuf *request) { - uint32_t send_xid = ((struct ofp_header *) request->data)->xid; + ovs_be32 send_xid = ((struct ofp_header *) request->data)->xid; struct vconn *vconn; bool done = false; @@ -352,7 +338,7 @@ dump_stats_transaction(const char *vconn_name, struct ofpbuf *request) if (send_xid == recv_xid) { struct ofp_stats_reply *osr; - ofp_print(stdout, reply->data, reply->size, 1); + ofp_print(stdout, reply->data, reply->size, verbosity + 1); osr = ofpbuf_at(reply, 0, sizeof *osr); done = !osr || !(ntohs(osr->flags) & OFPSF_REPLY_MORE); @@ -373,23 +359,55 @@ dump_trivial_stats_transaction(const char *vconn_name, uint8_t stats_type) dump_stats_transaction(vconn_name, request); } +/* 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. */ static void -do_show(const struct settings *s UNUSED, int argc UNUSED, char *argv[]) +transact_multiple_noreply(struct vconn *vconn, struct list *requests) +{ + struct ofpbuf *request, *reply; + + LIST_FOR_EACH (request, list_node, requests) { + update_openflow_length(request); + } + + run(vconn_transact_multiple_noreply(vconn, requests, &reply), + "talking to %s", vconn_get_name(vconn)); + if (reply) { + ofp_print(stderr, reply->data, reply->size, verbosity + 2); + exit(1); + } + ofpbuf_delete(reply); +} + +/* 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. */ +static void +transact_noreply(struct vconn *vconn, struct ofpbuf *request) +{ + struct list requests; + + list_init(&requests); + list_push_back(&requests, &request->list_node); + transact_multiple_noreply(vconn, &requests); +} + +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); } static void -do_status(const struct settings *s UNUSED, int argc, char *argv[]) +do_status(int argc, char *argv[]) { struct nicira_header *request, *reply; struct vconn *vconn; struct ofpbuf *b; - request = make_openflow(sizeof *request, OFPT_VENDOR, &b); - request->vendor = htonl(NX_VENDOR_ID); - request->subtype = htonl(NXT_STATUS_REQUEST); + request = make_nxmsg(sizeof *request, NXT_STATUS_REQUEST, &b); if (argc > 2) { ofpbuf_put(b, argv[2], strlen(argv[2])); update_openflow_length(b); @@ -405,7 +423,7 @@ do_status(const struct settings *s UNUSED, int argc, char *argv[]) if (reply->header.type != OFPT_VENDOR || reply->vendor != ntohl(NX_VENDOR_ID) || reply->subtype != ntohl(NXT_STATUS_REPLY)) { - ofp_print(stderr, b->data, b->size, 2); + ofp_print(stderr, b->data, b->size, verbosity + 2); ovs_fatal(0, "bad reply"); } @@ -413,598 +431,310 @@ do_status(const struct settings *s UNUSED, int argc, char *argv[]) } static void -do_dump_desc(const struct settings *s UNUSED, int argc UNUSED, char *argv[]) +do_dump_desc(int argc OVS_UNUSED, char *argv[]) { dump_trivial_stats_transaction(argv[1], OFPST_DESC); } static void -do_dump_tables(const struct settings *s UNUSED, int argc UNUSED, char *argv[]) +do_dump_tables(int argc OVS_UNUSED, char *argv[]) { dump_trivial_stats_transaction(argv[1], OFPST_TABLE); } - -static uint32_t -str_to_u32(const char *str) -{ - char *tail; - uint32_t value; - - errno = 0; - value = strtoul(str, &tail, 0); - if (errno == EINVAL || errno == ERANGE || *tail) { - ovs_fatal(0, "invalid numeric format %s", str); - } - return value; -} - +/* 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 -str_to_mac(const char *str, uint8_t mac[6]) +fetch_ofp_phy_port(const char *vconn_name, const char *port_name, + struct ofp_phy_port *oppp) { - if (sscanf(str, ETH_ADDR_SCAN_FMT, ETH_ADDR_SCAN_ARGS(mac)) - != ETH_ADDR_SCAN_COUNT) { - ovs_fatal(0, "invalid mac address %s", str); - } -} + struct ofpbuf *request, *reply; + struct ofp_switch_features *osf; + unsigned int port_no; + struct vconn *vconn; + int n_ports; + int port_idx; -static uint32_t -str_to_ip(const char *str_, uint32_t *ip) -{ - char *str = xstrdup(str_); - char *save_ptr = NULL; - const char *name, *netmask; - struct in_addr in_addr; - int n_wild, retval; - - name = strtok_r(str, "/", &save_ptr); - retval = name ? lookup_ip(name, &in_addr) : EINVAL; - if (retval) { - ovs_fatal(0, "%s: could not convert to IP address", str); - } - *ip = in_addr.s_addr; - - netmask = strtok_r(NULL, "/", &save_ptr); - if (netmask) { - uint8_t o[4]; - if (sscanf(netmask, "%"SCNu8".%"SCNu8".%"SCNu8".%"SCNu8, - &o[0], &o[1], &o[2], &o[3]) == 4) { - uint32_t nm = (o[0] << 24) | (o[1] << 16) | (o[2] << 8) | o[3]; - int i; - - /* Find first 1-bit. */ - for (i = 0; i < 32; i++) { - if (nm & (1u << i)) { - break; - } - } - n_wild = i; - - /* Verify that the rest of the bits are 1-bits. */ - for (; i < 32; i++) { - if (!(nm & (1u << i))) { - ovs_fatal(0, "%s: %s is not a valid netmask", - str, netmask); - } - } - } else { - int prefix = atoi(netmask); - if (prefix <= 0 || prefix > 32) { - ovs_fatal(0, "%s: network prefix bits not between 1 and 32", - str); - } - n_wild = 32 - prefix; - } - } else { - n_wild = 0; + /* Try to interpret the argument as a port number. */ + if (!str_to_uint(port_name, 10, &port_no)) { + port_no = UINT_MAX; } - free(str); - return n_wild; -} - -static void * -put_action(struct ofpbuf *b, size_t size, uint16_t type) -{ - struct ofp_action_header *ah = ofpbuf_put_zeros(b, size); - ah->type = htons(type); - ah->len = htons(size); - return ah; -} - -static struct ofp_action_output * -put_output_action(struct ofpbuf *b, uint16_t port) -{ - struct ofp_action_output *oao = put_action(b, sizeof *oao, OFPAT_OUTPUT); - oao->port = htons(port); - return oao; -} - -static void -put_dl_addr_action(struct ofpbuf *b, uint16_t type, const char *addr) -{ - struct ofp_action_dl_addr *oada = put_action(b, sizeof *oada, type); - str_to_mac(addr, oada->dl_addr); -} - + /* 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); -static bool -parse_port_name(const char *name, uint16_t *port) -{ - struct pair { - const char *name; - uint16_t value; - }; - static const struct pair pairs[] = { -#define DEF_PAIR(NAME) {#NAME, OFPP_##NAME} - DEF_PAIR(IN_PORT), - DEF_PAIR(TABLE), - DEF_PAIR(NORMAL), - DEF_PAIR(FLOOD), - DEF_PAIR(ALL), - DEF_PAIR(CONTROLLER), - DEF_PAIR(LOCAL), - DEF_PAIR(NONE), -#undef DEF_PAIR - }; - static const int n_pairs = ARRAY_SIZE(pairs); - size_t i; + 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 (i = 0; i < n_pairs; i++) { - if (!strcasecmp(name, pairs[i].name)) { - *port = pairs[i].value; - return true; + for (port_idx = 0; port_idx < n_ports; port_idx++) { + const struct ofp_phy_port *opp = &osf->ports[port_idx]; + + 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; } } - return false; + ovs_fatal(0, "%s: couldn't find port `%s'", vconn_name, port_name); } -static void -str_to_action(char *str, struct ofpbuf *b) +/* Returns the port number corresponding to 'port_name' (which may be a port + * name or number) within the switch 'vconn_name'. */ +static uint16_t +str_to_port_no(const char *vconn_name, const char *port_name) { - char *act, *arg; - char *saveptr = NULL; - bool drop = false; - int n_actions; - - for (act = strtok_r(str, ", \t\r\n", &saveptr), n_actions = 0; act; - act = strtok_r(NULL, ", \t\r\n", &saveptr), n_actions++) - { - uint16_t port; - - if (drop) { - ovs_fatal(0, "Drop actions must not be followed by other actions"); - } + unsigned int port_no; - /* Arguments are separated by colons */ - arg = strchr(act, ':'); - if (arg) { - *arg = '\0'; - arg++; - } + if (str_to_uint(port_name, 10, &port_no)) { + return port_no; + } else { + struct ofp_phy_port opp; - if (!strcasecmp(act, "mod_vlan_vid")) { - struct ofp_action_vlan_vid *va; - va = put_action(b, sizeof *va, OFPAT_SET_VLAN_VID); - va->vlan_vid = htons(str_to_u32(arg)); - } else if (!strcasecmp(act, "mod_vlan_pcp")) { - struct ofp_action_vlan_pcp *va; - va = put_action(b, sizeof *va, OFPAT_SET_VLAN_PCP); - va->vlan_pcp = str_to_u32(arg); - } else if (!strcasecmp(act, "strip_vlan")) { - struct ofp_action_header *ah; - ah = put_action(b, sizeof *ah, OFPAT_STRIP_VLAN); - ah->type = htons(OFPAT_STRIP_VLAN); - } else if (!strcasecmp(act, "mod_dl_src")) { - put_dl_addr_action(b, OFPAT_SET_DL_SRC, arg); - } else if (!strcasecmp(act, "mod_dl_dst")) { - put_dl_addr_action(b, OFPAT_SET_DL_DST, arg); - } else if (!strcasecmp(act, "output")) { - put_output_action(b, str_to_u32(arg)); - } else if (!strcasecmp(act, "drop")) { - /* A drop action in OpenFlow occurs by just not setting - * an action. */ - drop = true; - if (n_actions) { - ovs_fatal(0, "Drop actions must not be preceded by other " - "actions"); - } - } else if (!strcasecmp(act, "CONTROLLER")) { - struct ofp_action_output *oao; - oao = put_output_action(b, OFPP_CONTROLLER); - - /* Unless a numeric argument is specified, we send the whole - * packet to the controller. */ - if (arg && (strspn(act, "0123456789") == strlen(act))) { - oao->max_len = htons(str_to_u32(arg)); - } else { - oao->max_len = htons(UINT16_MAX); - } - } else if (parse_port_name(act, &port)) { - put_output_action(b, port); - } else if (strspn(act, "0123456789") == strlen(act)) { - put_output_action(b, str_to_u32(act)); - } else { - ovs_fatal(0, "Unknown action: %s", act); - } + fetch_ofp_phy_port(vconn_name, port_name, &opp); + return ntohs(opp.port_no); } } -struct protocol { - const char *name; - uint16_t dl_type; - uint8_t nw_proto; -}; - static bool -parse_protocol(const char *name, const struct protocol **p_out) +try_set_flow_format(struct vconn *vconn, enum nx_flow_format flow_format) { - static const struct protocol protocols[] = { - { "ip", ETH_TYPE_IP, 0 }, - { "arp", ETH_TYPE_ARP, 0 }, - { "icmp", ETH_TYPE_IP, IP_TYPE_ICMP }, - { "tcp", ETH_TYPE_IP, IP_TYPE_TCP }, - { "udp", ETH_TYPE_IP, IP_TYPE_UDP }, - }; - const struct protocol *p; - - for (p = protocols; p < &protocols[ARRAY_SIZE(protocols)]; p++) { - if (!strcmp(p->name, name)) { - *p_out = p; - return true; - } + struct ofpbuf *sff, *reply; + + 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; } - *p_out = NULL; - return false; + return true; } -struct field { - const char *name; - uint32_t wildcard; - enum { F_U8, F_U16, F_MAC, F_IP } type; - size_t offset, shift; -}; - -static bool -parse_field(const char *name, const struct field **f_out) +static void +set_flow_format(struct vconn *vconn, enum nx_flow_format flow_format) { -#define F_OFS(MEMBER) offsetof(struct ofp_match, MEMBER) - static const struct field fields[] = { - { "in_port", OFPFW_IN_PORT, F_U16, F_OFS(in_port), 0 }, - { "dl_vlan", OFPFW_DL_VLAN, F_U16, F_OFS(dl_vlan), 0 }, - { "dl_src", OFPFW_DL_SRC, F_MAC, F_OFS(dl_src), 0 }, - { "dl_dst", OFPFW_DL_DST, F_MAC, F_OFS(dl_dst), 0 }, - { "dl_type", OFPFW_DL_TYPE, F_U16, F_OFS(dl_type), 0 }, - { "nw_src", OFPFW_NW_SRC_MASK, F_IP, - F_OFS(nw_src), OFPFW_NW_SRC_SHIFT }, - { "nw_dst", OFPFW_NW_DST_MASK, F_IP, - F_OFS(nw_dst), OFPFW_NW_DST_SHIFT }, - { "nw_proto", OFPFW_NW_PROTO, F_U8, F_OFS(nw_proto), 0 }, - { "tp_src", OFPFW_TP_SRC, F_U16, F_OFS(tp_src), 0 }, - { "tp_dst", OFPFW_TP_DST, F_U16, F_OFS(tp_dst), 0 }, - { "icmp_type", OFPFW_ICMP_TYPE, F_U16, F_OFS(icmp_type), 0 }, - { "icmp_code", OFPFW_ICMP_CODE, F_U16, F_OFS(icmp_code), 0 } - }; - const struct field *f; - - for (f = fields; f < &fields[ARRAY_SIZE(fields)]; f++) { - if (!strcmp(f->name, name)) { - *f_out = f; - return true; - } - } - *f_out = NULL; - return false; + 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)); } -static void -str_to_flow(char *string, struct ofp_match *match, struct ofpbuf *actions, - uint8_t *table_idx, uint16_t *out_port, uint16_t *priority, - uint16_t *idle_timeout, uint16_t *hard_timeout) +static enum nx_flow_format +negotiate_highest_flow_format(struct vconn *vconn, const struct cls_rule *rule, + bool cookie_support, ovs_be64 cookie) { - char *save_ptr = NULL; - char *name; - uint32_t wildcards; + int flow_format; - if (table_idx) { - *table_idx = 0xff; - } - if (out_port) { - *out_port = OFPP_NONE; - } - if (priority) { - *priority = OFP_DEFAULT_PRIORITY; - } - if (idle_timeout) { - *idle_timeout = DEFAULT_IDLE_TIMEOUT; - } - if (hard_timeout) { - *hard_timeout = OFP_FLOW_PERMANENT; - } - if (actions) { - char *act_str = strstr(string, "action"); - if (!act_str) { - ovs_fatal(0, "must specify an action"); - } - *(act_str-1) = '\0'; + if (preferred_flow_format != -1) { + enum nx_flow_format min_format; - act_str = strchr(act_str, '='); - if (!act_str) { - ovs_fatal(0, "must specify an action"); + min_format = ofputil_min_flow_format(rule, cookie_support, cookie); + if (preferred_flow_format >= min_format) { + set_flow_format(vconn, preferred_flow_format); + return preferred_flow_format; } - act_str++; - - str_to_action(act_str, actions); + VLOG_WARN("%s: cannot use requested flow format %s for " + "specified flow", vconn_get_name(vconn), + ofputil_flow_format_to_string(min_format)); } - memset(match, 0, sizeof *match); - wildcards = OFPFW_ALL; - for (name = strtok_r(string, "=, \t\r\n", &save_ptr); name; - name = strtok_r(NULL, "=, \t\r\n", &save_ptr)) { - const struct protocol *p; - - if (parse_protocol(name, &p)) { - wildcards &= ~OFPFW_DL_TYPE; - match->dl_type = htons(p->dl_type); - if (p->nw_proto) { - wildcards &= ~OFPFW_NW_PROTO; - match->nw_proto = p->nw_proto; - } - } else { - const struct field *f; - char *value; - value = strtok_r(NULL, ", \t\r\n", &save_ptr); - if (!value) { - ovs_fatal(0, "field %s missing value", name); - } - - if (table_idx && !strcmp(name, "table")) { - *table_idx = atoi(value); - } else if (out_port && !strcmp(name, "out_port")) { - *out_port = atoi(value); - } else if (priority && !strcmp(name, "priority")) { - *priority = atoi(value); - } else if (idle_timeout && !strcmp(name, "idle_timeout")) { - *idle_timeout = atoi(value); - } else if (hard_timeout && !strcmp(name, "hard_timeout")) { - *hard_timeout = atoi(value); - } else if (parse_field(name, &f)) { - void *data = (char *) match + f->offset; - if (!strcmp(value, "*") || !strcmp(value, "ANY")) { - wildcards |= f->wildcard; - } else { - wildcards &= ~f->wildcard; - if (f->wildcard == OFPFW_IN_PORT - && parse_port_name(value, (uint16_t *) data)) { - /* Nothing to do. */ - } else if (f->type == F_U8) { - *(uint8_t *) data = str_to_u32(value); - } else if (f->type == F_U16) { - *(uint16_t *) data = htons(str_to_u32(value)); - } else if (f->type == F_MAC) { - str_to_mac(value, data); - } else if (f->type == F_IP) { - wildcards |= str_to_ip(value, data) << f->shift; - } else { - NOT_REACHED(); - } - } - } else { - ovs_fatal(0, "unknown keyword %s", name); - } - } + if (try_set_flow_format(vconn, NXFF_NXM)) { + flow_format = NXFF_NXM; + } else if (try_set_flow_format(vconn, NXFF_TUN_ID_FROM_COOKIE)) { + flow_format = NXFF_TUN_ID_FROM_COOKIE; + } else { + flow_format = NXFF_OPENFLOW10; } - match->wildcards = htonl(wildcards); + + VLOG_DBG("%s: negotiated flow format %s", vconn_get_name(vconn), + ofputil_flow_format_to_string(flow_format)); + return flow_format; } static void -do_dump_flows(const struct settings *s UNUSED, int argc, char *argv[]) +do_dump_flows__(int argc, char *argv[], bool aggregate) { - struct ofp_flow_stats_request *req; - uint16_t out_port; + enum nx_flow_format flow_format; + struct flow_stats_request fsr; struct ofpbuf *request; + struct vconn *vconn; - req = alloc_stats_request(sizeof *req, OFPST_FLOW, &request); - str_to_flow(argc > 2 ? argv[2] : "", &req->match, NULL, - &req->table_id, &out_port, NULL, NULL, NULL); - memset(&req->pad, 0, sizeof req->pad); - req->out_port = htons(out_port); + parse_ofp_flow_stats_request_str(&fsr, aggregate, argc > 2 ? argv[2] : ""); + open_vconn(argv[1], &vconn); + flow_format = negotiate_highest_flow_format(vconn, &fsr.match, false, 0); + request = ofputil_encode_flow_stats_request(&fsr, flow_format); dump_stats_transaction(argv[1], request); + vconn_close(vconn); } static void -do_dump_aggregate(const struct settings *s UNUSED, int argc, char *argv[]) +do_dump_flows(int argc, char *argv[]) { - struct ofp_aggregate_stats_request *req; + return do_dump_flows__(argc, argv, false); +} + +static void +do_dump_aggregate(int argc, char *argv[]) +{ + return do_dump_flows__(argc, argv, true); +} + +static void +do_queue_stats(int argc, char *argv[]) +{ + struct ofp_queue_stats_request *req; struct ofpbuf *request; - uint16_t out_port; - req = alloc_stats_request(sizeof *req, OFPST_AGGREGATE, &request); - str_to_flow(argc > 2 ? argv[2] : "", &req->match, NULL, - &req->table_id, &out_port, NULL, NULL, NULL); - memset(&req->pad, 0, sizeof req->pad); - req->out_port = htons(out_port); + req = alloc_stats_request(sizeof *req, OFPST_QUEUE, &request); + + if (argc > 2 && argv[2][0] && strcasecmp(argv[2], "all")) { + req->port_no = htons(str_to_port_no(argv[1], argv[2])); + } else { + req->port_no = htons(OFPP_ALL); + } + if (argc > 3 && argv[3][0] && strcasecmp(argv[3], "all")) { + req->queue_id = htonl(atoi(argv[3])); + } else { + req->queue_id = htonl(OFPQ_ALL); + } + + memset(req->pad, 0, sizeof req->pad); dump_stats_transaction(argv[1], request); } static void -do_add_flow(const struct settings *s UNUSED, int argc UNUSED, char *argv[]) +do_flow_mod__(int argc OVS_UNUSED, char *argv[], uint16_t command) { + enum nx_flow_format flow_format; + struct list requests; struct vconn *vconn; - struct ofpbuf *buffer; - struct ofp_flow_mod *ofm; - uint16_t priority, idle_timeout, hard_timeout; - struct ofp_match match; - - /* Parse and send. str_to_flow() will expand and reallocate the data in - * 'buffer', so we can't keep pointers to across the str_to_flow() call. */ - make_openflow(sizeof *ofm, OFPT_FLOW_MOD, &buffer); - str_to_flow(argv[2], &match, buffer, - NULL, NULL, &priority, &idle_timeout, &hard_timeout); - ofm = buffer->data; - ofm->match = match; - ofm->command = htons(OFPFC_ADD); - ofm->idle_timeout = htons(idle_timeout); - ofm->hard_timeout = htons(hard_timeout); - ofm->buffer_id = htonl(UINT32_MAX); - ofm->priority = htons(priority); - ofm->reserved = htonl(0); + + list_init(&requests); + flow_format = NXFF_OPENFLOW10; + parse_ofp_flow_mod_str(&requests, &flow_format, argc > 2 ? argv[2] : "", + command); open_vconn(argv[1], &vconn); - send_openflow_buffer(vconn, buffer); + transact_multiple_noreply(vconn, &requests); vconn_close(vconn); } static void -do_add_flows(const struct settings *s UNUSED, int argc UNUSED, char *argv[]) +do_add_flow(int argc, char *argv[]) { + do_flow_mod__(argc, argv, OFPFC_ADD); +} + +static void +do_add_flows(int argc OVS_UNUSED, char *argv[]) +{ + enum nx_flow_format flow_format; + struct list requests; struct vconn *vconn; FILE *file; - char line[1024]; file = fopen(argv[2], "r"); if (file == NULL) { ovs_fatal(errno, "%s: open", argv[2]); } - open_vconn(argv[1], &vconn); - while (fgets(line, sizeof line, file)) { - struct ofpbuf *buffer; - struct ofp_flow_mod *ofm; - uint16_t priority, idle_timeout, hard_timeout; - struct ofp_match match; - - char *comment; - - /* Delete comments. */ - comment = strchr(line, '#'); - if (comment) { - *comment = '\0'; - } - - /* Drop empty lines. */ - if (line[strspn(line, " \t\n")] == '\0') { - continue; - } + list_init(&requests); + flow_format = NXFF_OPENFLOW10; - /* Parse and send. str_to_flow() will expand and reallocate the data - * in 'buffer', so we can't keep pointers to across the str_to_flow() - * call. */ - ofm = make_openflow(sizeof *ofm, OFPT_FLOW_MOD, &buffer); - str_to_flow(line, &match, buffer, - NULL, NULL, &priority, &idle_timeout, &hard_timeout); - ofm = buffer->data; - ofm->match = match; - ofm->command = htons(OFPFC_ADD); - ofm->idle_timeout = htons(idle_timeout); - ofm->hard_timeout = htons(hard_timeout); - ofm->buffer_id = htonl(UINT32_MAX); - ofm->priority = htons(priority); - ofm->reserved = htonl(0); - - send_openflow_buffer(vconn, buffer); + open_vconn(argv[1], &vconn); + while (parse_ofp_add_flow_file(&requests, &flow_format, file)) { + transact_multiple_noreply(vconn, &requests); } vconn_close(vconn); + fclose(file); } static void -do_mod_flows(const struct settings *s, int argc UNUSED, char *argv[]) +do_mod_flows(int argc, char *argv[]) { - uint16_t priority, idle_timeout, hard_timeout; - struct vconn *vconn; - struct ofpbuf *buffer; - struct ofp_flow_mod *ofm; - struct ofp_match match; - - /* Parse and send. str_to_flow() will expand and reallocate the data in - * 'buffer', so we can't keep pointers to across the str_to_flow() call. */ - make_openflow(sizeof *ofm, OFPT_FLOW_MOD, &buffer); - str_to_flow(argv[2], &match, buffer, - NULL, NULL, &priority, &idle_timeout, &hard_timeout); - ofm = buffer->data; - ofm->match = match; - if (s->strict) { - ofm->command = htons(OFPFC_MODIFY_STRICT); - } else { - ofm->command = htons(OFPFC_MODIFY); - } - ofm->idle_timeout = htons(idle_timeout); - ofm->hard_timeout = htons(hard_timeout); - ofm->buffer_id = htonl(UINT32_MAX); - ofm->priority = htons(priority); - ofm->reserved = htonl(0); + do_flow_mod__(argc, argv, strict ? OFPFC_MODIFY_STRICT : OFPFC_MODIFY); +} - open_vconn(argv[1], &vconn); - send_openflow_buffer(vconn, buffer); - vconn_close(vconn); +static void +do_del_flows(int argc, char *argv[]) +{ + do_flow_mod__(argc, argv, strict ? OFPFC_DELETE_STRICT : OFPFC_DELETE); } -static void do_del_flows(const struct settings *s, int argc, char *argv[]) +static void +monitor_vconn(struct vconn *vconn) { - struct vconn *vconn; - uint16_t priority; - uint16_t out_port; - struct ofpbuf *buffer; - struct ofp_flow_mod *ofm; - - /* Parse and send. */ - ofm = make_openflow(sizeof *ofm, OFPT_FLOW_MOD, &buffer); - str_to_flow(argc > 2 ? argv[2] : "", &ofm->match, NULL, NULL, - &out_port, &priority, NULL, NULL); - if (s->strict) { - ofm->command = htons(OFPFC_DELETE_STRICT); - } else { - ofm->command = htons(OFPFC_DELETE); + for (;;) { + struct ofpbuf *b; + run(vconn_recv_block(vconn, &b), "vconn_recv"); + ofp_print(stderr, b->data, b->size, verbosity + 2); + ofpbuf_delete(b); } - ofm->idle_timeout = htons(0); - ofm->hard_timeout = htons(0); - ofm->buffer_id = htonl(UINT32_MAX); - ofm->out_port = htons(out_port); - ofm->priority = htons(priority); - ofm->reserved = htonl(0); - - open_vconn(argv[1], &vconn); - send_openflow_buffer(vconn, buffer); - vconn_close(vconn); } static void -do_monitor(const struct settings *s UNUSED, int argc UNUSED, char *argv[]) +do_monitor(int argc, char *argv[]) { struct vconn *vconn; open_vconn(argv[1], &vconn); if (argc > 2) { int miss_send_len = atoi(argv[2]); - int send_flow_exp = argc > 3 ? atoi(argv[3]) : 0; struct ofp_switch_config *osc; struct ofpbuf *buf; osc = make_openflow(sizeof *osc, OFPT_SET_CONFIG, &buf); - osc->flags = htons(send_flow_exp ? OFPC_SEND_FLOW_EXP : 0); osc->miss_send_len = htons(miss_send_len); - send_openflow_buffer(vconn, buf); - } - for (;;) { - struct ofpbuf *b; - run(vconn_recv_block(vconn, &b), "vconn_recv"); - ofp_print(stderr, b->data, b->size, 2); - ofpbuf_delete(b); + transact_noreply(vconn, buf); } + monitor_vconn(vconn); } static void -do_dump_ports(const struct settings *s UNUSED, int argc UNUSED, char *argv[]) +do_snoop(int argc OVS_UNUSED, char *argv[]) { - dump_trivial_stats_transaction(argv[1], OFPST_PORT); + struct vconn *vconn; + + open_vconn__(argv[1], "snoop", &vconn); + monitor_vconn(vconn); +} + +static void +do_dump_ports(int argc, char *argv[]) +{ + struct ofp_port_stats_request *req; + struct ofpbuf *request; + uint16_t port; + + req = alloc_stats_request(sizeof *req, OFPST_PORT, &request); + port = argc > 2 ? str_to_port_no(argv[1], argv[2]) : OFPP_NONE; + req->port_no = htons(port); + dump_stats_transaction(argv[1], request); } static void -do_probe(const struct settings *s UNUSED, int argc UNUSED, char *argv[]) +do_probe(int argc OVS_UNUSED, char *argv[]) { struct ofpbuf *request; struct vconn *vconn; @@ -1021,87 +751,43 @@ do_probe(const struct settings *s UNUSED, int argc UNUSED, char *argv[]) } static void -do_mod_port(const struct settings *s UNUSED, int argc UNUSED, char *argv[]) +do_mod_port(int argc OVS_UNUSED, char *argv[]) { - struct ofpbuf *request, *reply; - struct ofp_switch_features *osf; struct ofp_port_mod *opm; + struct ofp_phy_port opp; + struct ofpbuf *request; struct vconn *vconn; - char *endptr; - int n_ports; - int port_idx; - int port_no; - - - /* Check if the argument is a port index. Otherwise, treat it as - * the port name. */ - port_no = strtol(argv[2], &endptr, 10); - if (port_no == 0 && endptr == argv[2]) { - port_no = -1; - } - - /* Send a "Features Request" to get the information we need in order - * to modify the port. */ - make_openflow(sizeof(struct ofp_header), OFPT_FEATURES_REQUEST, &request); - open_vconn(argv[1], &vconn); - run(vconn_transact(vconn, request, &reply), "talking to %s", argv[1]); - - osf = reply->data; - n_ports = (reply->size - sizeof *osf) / sizeof *osf->ports; - for (port_idx = 0; port_idx < n_ports; port_idx++) { - if (port_no != -1) { - /* Check argument as a port index */ - if (osf->ports[port_idx].port_no == htons(port_no)) { - break; - } - } else { - /* Check argument as an interface name */ - if (!strncmp((char *)osf->ports[port_idx].name, argv[2], - sizeof osf->ports[0].name)) { - break; - } - - } - } - if (port_idx == n_ports) { - ovs_fatal(0, "couldn't find monitored port: %s", argv[2]); - } + fetch_ofp_phy_port(argv[1], argv[2], &opp); opm = make_openflow(sizeof(struct ofp_port_mod), OFPT_PORT_MOD, &request); - opm->port_no = osf->ports[port_idx].port_no; - memcpy(opm->hw_addr, osf->ports[port_idx].hw_addr, sizeof opm->hw_addr); + 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); - printf("modifying port: %s\n", osf->ports[port_idx].name); - - if (!strncasecmp(argv[3], MOD_PORT_CMD_UP, sizeof MOD_PORT_CMD_UP)) { + if (!strcasecmp(argv[3], "up")) { opm->mask |= htonl(OFPPC_PORT_DOWN); - } else if (!strncasecmp(argv[3], MOD_PORT_CMD_DOWN, - sizeof MOD_PORT_CMD_DOWN)) { + } else if (!strcasecmp(argv[3], "down")) { opm->mask |= htonl(OFPPC_PORT_DOWN); opm->config |= htonl(OFPPC_PORT_DOWN); - } else if (!strncasecmp(argv[3], MOD_PORT_CMD_FLOOD, - sizeof MOD_PORT_CMD_FLOOD)) { + } else if (!strcasecmp(argv[3], "flood")) { opm->mask |= htonl(OFPPC_NO_FLOOD); - } else if (!strncasecmp(argv[3], MOD_PORT_CMD_NOFLOOD, - sizeof MOD_PORT_CMD_NOFLOOD)) { + } else if (!strcasecmp(argv[3], "noflood")) { opm->mask |= htonl(OFPPC_NO_FLOOD); opm->config |= htonl(OFPPC_NO_FLOOD); } else { ovs_fatal(0, "unknown mod-port command '%s'", argv[3]); } - send_openflow_buffer(vconn, request); - - ofpbuf_delete(reply); + open_vconn(argv[1], &vconn); + transact_noreply(vconn, request); vconn_close(vconn); } static void -do_ping(const struct settings *s UNUSED, int argc, char *argv[]) +do_ping(int argc, char *argv[]) { size_t max_payload = 65535 - sizeof(struct ofp_header); unsigned int payload; @@ -1133,12 +819,12 @@ do_ping(const struct settings *s UNUSED, int argc, char *argv[]) || rpy_hdr->xid != rq_hdr->xid || rpy_hdr->type != OFPT_ECHO_REPLY) { printf("Reply does not match request. Request:\n"); - ofp_print(stdout, request, request->size, 2); + ofp_print(stdout, request, request->size, verbosity + 2); printf("Reply:\n"); - ofp_print(stdout, reply, reply->size, 2); + ofp_print(stdout, reply, reply->size, verbosity + 2); } printf("%zu bytes from %s: xid=%08"PRIx32" time=%.1f ms\n", - reply->size - sizeof *rpy_hdr, argv[1], rpy_hdr->xid, + reply->size - sizeof *rpy_hdr, argv[1], ntohl(rpy_hdr->xid), (1000*(double)(end.tv_sec - start.tv_sec)) + (.001*(end.tv_usec - start.tv_usec))); ofpbuf_delete(request); @@ -1148,7 +834,7 @@ do_ping(const struct settings *s UNUSED, int argc, char *argv[]) } static void -do_benchmark(const struct settings *s UNUSED, int argc UNUSED, char *argv[]) +do_benchmark(int argc OVS_UNUSED, char *argv[]) { size_t max_payload = 65535 - sizeof(struct ofp_header); struct timeval start, end; @@ -1191,94 +877,168 @@ do_benchmark(const struct settings *s UNUSED, int argc UNUSED, char *argv[]) } static void -do_execute(const struct settings *s UNUSED, int argc, char *argv[]) +do_help(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) { - struct vconn *vconn; - struct ofpbuf *request; - struct nicira_header *nicira; - struct nx_command_reply *ncr; - uint32_t xid; - int i; + usage(); +} + +/* Undocumented commands for unit testing. */ + +static void +print_packet_list(struct list *packets) +{ + struct ofpbuf *packet, *next; - nicira = make_openflow(sizeof *nicira, OFPT_VENDOR, &request); - xid = nicira->header.xid; - nicira->vendor = htonl(NX_VENDOR_ID); - nicira->subtype = htonl(NXT_COMMAND_REQUEST); - ofpbuf_put(request, argv[2], strlen(argv[2])); - for (i = 3; i < argc; i++) { - ofpbuf_put_zeros(request, 1); - ofpbuf_put(request, argv[i], strlen(argv[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); } - update_openflow_length(request); +} - open_vconn(argv[1], &vconn); - run(vconn_send_block(vconn, request), "send"); +/* "parse-flow FLOW": parses the argument as a flow (like add-flow) and prints + * it back to stdout. */ +static void +do_parse_flow(int argc OVS_UNUSED, char *argv[]) +{ + enum nx_flow_format flow_format; + struct list packets; - for (;;) { - struct ofpbuf *reply; - uint32_t status; + flow_format = NXFF_OPENFLOW10; + if (preferred_flow_format > 0) { + flow_format = preferred_flow_format; + } - run(vconn_recv_xid(vconn, xid, &reply), "recv_xid"); - if (reply->size < sizeof *ncr) { - ovs_fatal(0, "reply is too short (%zu bytes < %zu bytes)", - reply->size, sizeof *ncr); + list_init(&packets); + parse_ofp_flow_mod_str(&packets, &flow_format, argv[1], OFPFC_ADD); + print_packet_list(&packets); +} + +/* "parse-flows FILENAME": reads the named file as a sequence of flows (like + * add-flows) and prints each of the flows back to stdout. */ +static void +do_parse_flows(int argc OVS_UNUSED, char *argv[]) +{ + enum nx_flow_format flow_format; + struct list packets; + FILE *file; + + file = fopen(argv[1], "r"); + if (file == NULL) { + ovs_fatal(errno, "%s: open", argv[2]); + } + + flow_format = NXFF_OPENFLOW10; + if (preferred_flow_format > 0) { + flow_format = preferred_flow_format; + } + + list_init(&packets); + while (parse_ofp_add_flow_file(&packets, &flow_format, file)) { + print_packet_list(&packets); + } + fclose(file); +} + +/* "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) +{ + struct ds in; + + ds_init(&in); + while (!ds_get_line(&in, stdin)) { + struct ofpbuf nx_match; + struct cls_rule rule; + int match_len; + int error; + char *s; + + /* Delete comments, skip blank lines. */ + s = ds_cstr(&in); + if (*s == '#') { + puts(s); + continue; } - ncr = reply->data; - if (ncr->nxh.header.type != OFPT_VENDOR - || ncr->nxh.vendor != htonl(NX_VENDOR_ID) - || ncr->nxh.subtype != htonl(NXT_COMMAND_REPLY)) { - ovs_fatal(0, "reply is invalid"); + if (strchr(s, '#')) { + *strchr(s, '#') = '\0'; } - - status = ntohl(ncr->status); - if (status & NXT_STATUS_STARTED) { - /* Wait for a second reply. */ + if (s[strspn(s, " ")] == '\0') { + putchar('\n'); continue; - } else if (status & NXT_STATUS_EXITED) { - fprintf(stderr, "process terminated normally with exit code %d", - status & NXT_STATUS_EXITSTATUS); - } else if (status & NXT_STATUS_SIGNALED) { - fprintf(stderr, "process terminated by signal %d", - status & NXT_STATUS_TERMSIG); - } else if (status & NXT_STATUS_ERROR) { - fprintf(stderr, "error executing command"); - } else { - fprintf(stderr, "process terminated for unknown reason"); } - if (status & NXT_STATUS_COREDUMP) { - fprintf(stderr, " (core dumped)"); + + /* Convert string to nx_match. */ + ofpbuf_init(&nx_match, 0); + match_len = nx_match_from_string(ds_cstr(&in), &nx_match); + + /* Convert nx_match to cls_rule. */ + error = nx_pull_match(&nx_match, match_len, 0, &rule); + if (!error) { + char *out; + + /* Convert cls_rule back to nx_match. */ + ofpbuf_uninit(&nx_match); + ofpbuf_init(&nx_match, 0); + match_len = nx_put_match(&nx_match, &rule); + + /* Convert nx_match to string. */ + out = nx_match_to_string(nx_match.data, match_len); + puts(out); + free(out); + } else { + printf("nx_pull_match() returned error %x\n", error); } - putc('\n', stderr); - fwrite(ncr + 1, reply->size - sizeof *ncr, 1, stdout); - break; + ofpbuf_uninit(&nx_match); } + ds_destroy(&in); } +/* "ofp-print HEXSTRING [VERBOSITY]": Converts the hex digits in HEXSTRING into + * binary data, interpreting them as an OpenFlow message, and prints the + * OpenFlow message on stdout, at VERBOSITY (level 2 by default). */ static void -do_help(const struct settings *s UNUSED, int argc UNUSED, char *argv[] UNUSED) +do_ofp_print(int argc, char *argv[]) { - usage(); + struct ofpbuf packet; + + ofpbuf_init(&packet, strlen(argv[1]) / 2); + if (ofpbuf_put_hex(&packet, argv[1], NULL)[0] != '\0') { + ovs_fatal(0, "trailing garbage following hex bytes"); + } + ofp_print(stdout, packet.data, packet.size, argc > 2 ? atoi(argv[2]) : 2); + ofpbuf_uninit(&packet); } -static struct command all_commands[] = { +static const struct command all_commands[] = { { "show", 1, 1, do_show }, { "status", 1, 2, do_status }, - { "monitor", 1, 3, do_monitor }, + { "monitor", 1, 2, do_monitor }, + { "snoop", 1, 1, do_snoop }, { "dump-desc", 1, 1, do_dump_desc }, { "dump-tables", 1, 1, do_dump_tables }, { "dump-flows", 1, 2, do_dump_flows }, { "dump-aggregate", 1, 2, do_dump_aggregate }, + { "queue-stats", 1, 3, do_queue_stats }, { "add-flow", 2, 2, do_add_flow }, { "add-flows", 2, 2, do_add_flows }, { "mod-flows", 2, 2, do_mod_flows }, { "del-flows", 1, 2, do_del_flows }, - { "dump-ports", 1, 1, do_dump_ports }, + { "dump-ports", 1, 2, do_dump_ports }, { "mod-port", 3, 3, do_mod_port }, { "probe", 1, 1, do_probe }, { "ping", 1, 2, do_ping }, { "benchmark", 3, 3, do_benchmark }, - { "execute", 2, INT_MAX, do_execute }, { "help", 0, INT_MAX, do_help }, + + /* Undocumented commands for testing. */ + { "parse-flow", 1, 1, do_parse_flow }, + { "parse-flows", 1, 1, do_parse_flows }, + { "parse-nx-match", 0, 0, do_parse_nx_match }, + { "ofp-print", 1, 2, do_ofp_print }, + { NULL, 0, 0, NULL }, };