/*
- * Copyright (c) 2008, 2009, 2010 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.
*/
#include <config.h>
-#include <arpa/inet.h>
#include <errno.h>
#include <getopt.h>
#include <inttypes.h>
+#include <sys/socket.h>
#include <net/if.h>
-#include <netinet/in.h>
#include <signal.h>
-#include <stdarg.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/stat.h>
#include <sys/time.h>
+#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 "ofproto/ofproto.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.h"
-
#include "vlog.h"
-#define THIS_MODULE VLM_ofctl
-
-#define DEFAULT_IDLE_TIMEOUT 60
-#define MOD_PORT_CMD_UP "up"
-#define MOD_PORT_CMD_DOWN "down"
-#define MOD_PORT_CMD_FLOOD "flood"
-#define MOD_PORT_CMD_NOFLOOD "noflood"
+VLOG_DEFINE_THIS_MODULE(ofctl);
-/* Use strict matching for flow mod commands? */
+/* --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;
+
+/* -m, --more: Additional verbosity for ofp-print functions. */
+static int verbosity;
+
static const struct command all_commands[];
static void usage(void) NO_RETURN;
main(int argc, char *argv[])
{
set_program_name(argv[0]);
- time_init();
- vlog_init();
parse_options(argc, argv);
signal(SIGPIPE, SIG_IGN);
run_command(argc - optind, argv + optind, all_commands);
VLOG_OPTION_ENUMS
};
static struct option long_options[] = {
- {"timeout", required_argument, 0, 't'},
- {"strict", no_argument, 0, OPT_STRICT},
- {"help", no_argument, 0, 'h'},
- {"version", no_argument, 0, 'V'},
+ {"timeout", required_argument, NULL, 't'},
+ {"strict", no_argument, NULL, OPT_STRICT},
+ {"flow-format", required_argument, NULL, 'F'},
+ {"more", no_argument, NULL, 'm'},
+ {"help", no_argument, NULL, 'h'},
+ {"version", no_argument, NULL, 'V'},
VLOG_LONG_OPTIONS,
- STREAM_SSL_LONG_OPTIONS
- {0, 0, 0, 0},
+ STREAM_SSL_LONG_OPTIONS,
+ {NULL, 0, NULL, 0},
};
char *short_options = long_options_to_short_options(long_options);
}
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();
"usage: %s [OPTIONS] COMMAND [ARG...]\n"
"\nFor OpenFlow switches:\n"
" show SWITCH show OpenFlow information\n"
- " status SWITCH [KEY] report statistics (about KEY)\n"
" 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"
+ " 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"
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");
if (retval) {
va_list args;
- fprintf(stderr, "%s: ", program_name);
va_start(args, message);
- vfprintf(stderr, message, args);
- va_end(args);
- if (retval == EOF) {
- fputs(": unexpected end of file\n", stderr);
- } else {
- fprintf(stderr, ": %s\n", strerror(retval));
- }
-
- exit(EXIT_FAILURE);
+ ovs_fatal_valist(retval, message, args);
}
}
\f
open_vconn_socket(const char *name, struct vconn **vconnp)
{
char *vconn_name = xasprintf("unix:%s", name);
- VLOG_INFO("connecting to %s", vconn_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, struct vconn **vconnp)
+open_vconn__(const char *name, const char *default_suffix,
+ struct vconn **vconnp)
{
- struct dpif *dpif;
+ char *datapath_name, *datapath_type, *socket_name;
+ char *bridge_path;
struct stat s;
- char *bridge_path, *datapath_name, *datapath_type;
- bridge_path = xasprintf("%s/%s.mgmt", ovs_rundir, name);
- dp_parse_name(name, &datapath_name, &datapath_type);
+ bridge_path = xasprintf("%s/%s.%s", ovs_rundir(), name, default_suffix);
+
+ ofproto_parse_name(name, &datapath_name, &datapath_type);
+ socket_name = xasprintf("%s/%s.%s",
+ ovs_rundir(), datapath_name, default_suffix);
+ free(datapath_name);
+ free(datapath_type);
if (strstr(name, ":")) {
run(vconn_open_block(name, OFP_VERSION, vconnp),
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;
-
- 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);
- }
-
- socket_name = xasprintf("%s/%s.mgmt", ovs_rundir, dpif_name);
- if (stat(socket_name, &s)) {
- ovs_fatal(errno, "cannot connect to %s: stat failed on %s",
- name, socket_name);
- } else if (!S_ISSOCK(s.st_mode)) {
+ } 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);
- free(socket_name);
} else {
ovs_fatal(0, "%s is not a valid connection method", name);
}
- free(datapath_name);
- free(datapath_type);
free(bridge_path);
+ free(socket_name);
+}
+
+static void
+open_vconn(const char *name, struct vconn **vconnp)
+{
+ return open_vconn__(name, "mgmt", vconnp);
}
static void *
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);
}
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;
open_vconn(vconn_name, &vconn);
send_openflow_buffer(vconn, request);
while (!done) {
- uint32_t recv_xid;
+ ovs_be32 recv_xid;
struct ofpbuf *reply;
run(vconn_recv_block(vconn, &reply), "OpenFlow packet receive failed");
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);
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(int argc OVS_UNUSED, char *argv[])
+transact_multiple_noreply(struct vconn *vconn, struct list *requests)
{
- dump_trivial_transaction(argv[1], OFPT_FEATURES_REQUEST);
- dump_trivial_transaction(argv[1], OFPT_GET_CONFIG_REQUEST);
+ 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
-do_status(int argc, char *argv[])
+transact_noreply(struct vconn *vconn, struct ofpbuf *request)
{
- 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);
- if (argc > 2) {
- ofpbuf_put(b, argv[2], strlen(argv[2]));
- update_openflow_length(b);
- }
- open_vconn(argv[1], &vconn);
- run(vconn_transact(vconn, b, &b), "talking to %s", argv[1]);
- vconn_close(vconn);
+ struct list requests;
- if (b->size < sizeof *reply) {
- ovs_fatal(0, "short reply (%zu bytes)", b->size);
- }
- reply = b->data;
- 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);
- ovs_fatal(0, "bad reply");
- }
+ list_init(&requests);
+ list_push_back(&requests, &request->list_node);
+ transact_multiple_noreply(vconn, &requests);
+}
- fwrite(reply + 1, b->size - sizeof *reply, 1, stdout);
+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
dump_trivial_stats_transaction(argv[1], OFPST_TABLE);
}
-
-static uint32_t
-str_to_u32(const char *str)
+/* Opens a connection to 'vconn_name', fetches the ofp_phy_port structure for
+ * 'port_name' (which may be a port name or number), and copies it into
+ * '*oppp'. */
+static void
+fetch_ofp_phy_port(const char *vconn_name, const char *port_name,
+ struct ofp_phy_port *oppp)
{
- char *tail;
- uint32_t value;
+ struct ofpbuf *request, *reply;
+ struct ofp_switch_features *osf;
+ unsigned int port_no;
+ struct vconn *vconn;
+ int n_ports;
+ int port_idx;
- errno = 0;
- value = strtoul(str, &tail, 0);
- if (errno == EINVAL || errno == ERANGE || *tail) {
- ovs_fatal(0, "invalid numeric format %s", str);
+ /* Try to interpret the argument as a port number. */
+ if (!str_to_uint(port_name, 10, &port_no)) {
+ port_no = UINT_MAX;
}
- return value;
-}
-static void
-str_to_mac(const char *str, uint8_t mac[6])
-{
- if (sscanf(str, ETH_ADDR_SCAN_FMT, ETH_ADDR_SCAN_ARGS(mac))
- != ETH_ADDR_SCAN_COUNT) {
- ovs_fatal(0, "invalid mac address %s", str);
- }
-}
+ /* 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 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);
+ osf = reply->data;
+ if (reply->size < sizeof *osf) {
+ ovs_fatal(0, "%s: received too-short features reply (only %zu bytes)",
+ vconn_name, reply->size);
}
- *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;
+ n_ports = (reply->size - sizeof *osf) / sizeof *osf->ports;
- /* 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;
+ 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;
}
- } else {
- n_wild = 0;
}
-
- free(str);
- return n_wild;
+ ovs_fatal(0, "%s: couldn't find port `%s'", vconn_name, port_name);
}
-static void *
-put_action(struct ofpbuf *b, size_t size, uint16_t type)
+/* 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)
{
- struct ofp_action_header *ah = ofpbuf_put_zeros(b, size);
- ah->type = htons(type);
- ah->len = htons(size);
- return ah;
-}
+ unsigned int port_no;
-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;
-}
+ if (str_to_uint(port_name, 10, &port_no)) {
+ return port_no;
+ } else {
+ struct ofp_phy_port opp;
-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_ofp_phy_port(vconn_name, port_name, &opp);
+ return ntohs(opp.port_no);
+ }
}
-
static bool
-parse_port_name(const char *name, uint16_t *port)
+try_set_flow_format(struct vconn *vconn, enum nx_flow_format flow_format)
{
- 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;
-
- for (i = 0; i < n_pairs; i++) {
- if (!strcasecmp(name, pairs[i].name)) {
- *port = pairs[i].value;
- 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;
}
- return false;
+ return true;
}
static void
-str_to_action(char *str, struct ofpbuf *b)
+set_flow_format(struct vconn *vconn, enum nx_flow_format flow_format)
{
- 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");
- }
-
- /* Arguments are separated by colons */
- arg = strchr(act, ':');
- if (arg) {
- *arg = '\0';
- arg++;
- }
-
- 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, "mod_nw_src")) {
- struct ofp_action_nw_addr *na;
- na = put_action(b, sizeof *na, OFPAT_SET_NW_SRC);
- str_to_ip(arg, &na->nw_addr);
- } else if (!strcasecmp(act, "mod_nw_dst")) {
- struct ofp_action_nw_addr *na;
- na = put_action(b, sizeof *na, OFPAT_SET_NW_DST);
- str_to_ip(arg, &na->nw_addr);
- } else if (!strcasecmp(act, "mod_tp_src")) {
- struct ofp_action_tp_port *ta;
- ta = put_action(b, sizeof *ta, OFPAT_SET_TP_SRC);
- ta->tp_port = htons(str_to_u32(arg));
- } else if (!strcasecmp(act, "mod_tp_dst")) {
- struct ofp_action_tp_port *ta;
- ta = put_action(b, sizeof *ta, OFPAT_SET_TP_DST);
- ta->tp_port = htons(str_to_u32(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);
- }
- }
+ 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));
}
-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)
+static enum nx_flow_format
+negotiate_highest_flow_format(struct vconn *vconn,
+ enum nx_flow_format min_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;
+ 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));
}
- }
- *p_out = NULL;
- return false;
-}
-struct field {
- const char *name;
- uint32_t wildcard;
- enum { F_U8, F_U16, F_MAC, F_IP } type;
- size_t offset, shift;
-};
+ set_flow_format(vconn, preferred_flow_format);
+ return preferred_flow_format;
+ } else {
+ enum nx_flow_format flow_format;
-static bool
-parse_field(const char *name, const struct field **f_out)
-{
-#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;
+ if (try_set_flow_format(vconn, NXFF_NXM)) {
+ flow_format = NXFF_NXM;
+ } else {
+ flow_format = NXFF_OPENFLOW10;
+ }
- for (f = fields; f < &fields[ARRAY_SIZE(fields)]; f++) {
- if (!strcmp(f->name, name)) {
- *f_out = f;
- return true;
+ 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;
}
- *f_out = NULL;
- return false;
}
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)
+do_dump_flows__(int argc, char *argv[], bool aggregate)
{
- char *save_ptr = NULL;
- char *name;
- uint32_t wildcards;
-
- 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';
-
- act_str = strchr(act_str, '=');
- if (!act_str) {
- ovs_fatal(0, "must specify an action");
- }
-
- act_str++;
+ enum nx_flow_format min_flow_format, flow_format;
+ struct flow_stats_request fsr;
+ struct ofpbuf *request;
+ struct vconn *vconn;
- str_to_action(act_str, actions);
- }
- 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;
+ parse_ofp_flow_stats_request_str(&fsr, aggregate, argc > 2 ? argv[2] : "");
- 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);
- }
- }
- }
- match->wildcards = htonl(wildcards);
+ open_vconn(argv[1], &vconn);
+ min_flow_format = ofputil_min_flow_format(&fsr.match);
+ flow_format = negotiate_highest_flow_format(vconn, min_flow_format);
+ request = ofputil_encode_flow_stats_request(&fsr, flow_format);
+ dump_stats_transaction(argv[1], request);
+ vconn_close(vconn);
}
static void
do_dump_flows(int argc, char *argv[])
{
- struct ofp_flow_stats_request *req;
- uint16_t out_port;
- struct ofpbuf *request;
-
- 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);
-
- dump_stats_transaction(argv[1], request);
+ return do_dump_flows__(argc, argv, false);
}
static void
do_dump_aggregate(int argc, char *argv[])
{
- struct ofp_aggregate_stats_request *req;
+ 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(int argc OVS_UNUSED, char *argv[])
+/* 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)
{
- 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);
+ if (preferred_flow_format < 0) {
+ return NXFF_OPENFLOW10;
+ } else {
+ struct ofpbuf *sff;
- open_vconn(argv[1], &vconn);
- send_openflow_buffer(vconn, buffer);
- vconn_close(vconn);
+ sff = ofputil_make_set_flow_format(preferred_flow_format);
+ list_push_back(requests, &sff->list_node);
+ return preferred_flow_format;
+ }
}
+/* Checks that 'flow_format' is acceptable as a flow format after a flow_mod
+ * operation, given the global 'preferred_flow_format'. */
static void
-do_add_flows(int argc OVS_UNUSED, char *argv[])
+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));
+ }
+}
+
+static void
+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;
FILE *file;
- char line[1024];
- file = fopen(argv[2], "r");
+ file = !strcmp(argv[2], "-") ? stdin : 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 = set_initial_format_for_flow_mod(&requests);
+ flow_mod_table_id = false;
- /* 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(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_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);
}
vconn_close(vconn);
- fclose(file);
+
+ if (file != stdin) {
+ fclose(file);
+ }
}
static void
-do_mod_flows(int argc OVS_UNUSED, char *argv[])
+do_flow_mod__(int argc, char *argv[], uint16_t command)
{
- uint16_t priority, idle_timeout, hard_timeout;
+ enum nx_flow_format flow_format;
+ bool flow_mod_table_id;
+ struct list requests;
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 (strict) {
- ofm->command = htons(OFPFC_MODIFY_STRICT);
- } else {
- ofm->command = htons(OFPFC_MODIFY);
+
+ if (argc > 2 && !strcmp(argv[2], "-")) {
+ do_flow_mod_file__(argc, argv, command);
+ return;
}
- 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 = 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);
+ check_final_format_for_flow_mod(flow_format);
open_vconn(argv[1], &vconn);
- send_openflow_buffer(vconn, buffer);
+ transact_multiple_noreply(vconn, &requests);
vconn_close(vconn);
}
-static void do_del_flows(int argc, char *argv[])
+static void
+do_add_flow(int argc, char *argv[])
{
- 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 (strict) {
- ofm->command = htons(OFPFC_DELETE_STRICT);
- } else {
- ofm->command = htons(OFPFC_DELETE);
- }
- 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);
+ do_flow_mod__(argc, argv, OFPFC_ADD);
+}
- open_vconn(argv[1], &vconn);
- send_openflow_buffer(vconn, buffer);
- vconn_close(vconn);
+static void
+do_add_flows(int argc, char *argv[])
+{
+ do_flow_mod_file__(argc, argv, OFPFC_ADD);
}
static void
-do_monitor(int argc OVS_UNUSED, char *argv[])
+do_mod_flows(int argc, char *argv[])
+{
+ 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);
+}
+
+static void
+monitor_vconn(struct vconn *vconn)
+{
+ for (;;) {
+ struct ofpbuf *b;
+ run(vconn_recv_block(vconn, &b), "vconn_recv");
+ ofp_print(stderr, b->data, b->size, verbosity + 2);
+ ofpbuf_delete(b);
+ }
+}
+
+static void
+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(int argc OVS_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
static void
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);
}
OFPT_ECHO_REQUEST, &request);
random_bytes(rq_hdr + 1, payload);
- gettimeofday(&start, NULL);
+ xgettimeofday(&start);
run(vconn_transact(vconn, ofpbuf_clone(request), &reply), "transact");
- gettimeofday(&end, NULL);
+ xgettimeofday(&end);
rpy_hdr = reply->data;
if (reply->size != request->size
|| 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);
count, message_size, count * message_size);
open_vconn(argv[1], &vconn);
- gettimeofday(&start, NULL);
+ xgettimeofday(&start);
for (i = 0; i < count; i++) {
struct ofpbuf *request, *reply;
struct ofp_header *rq_hdr;
run(vconn_transact(vconn, request, &reply), "transact");
ofpbuf_delete(reply);
}
- gettimeofday(&end, NULL);
+ xgettimeofday(&end);
vconn_close(vconn);
duration = ((1000*(double)(end.tv_sec - start.tv_sec))
{
usage();
}
+\f
+/* replace-flows and diff-flows commands. */
+
+/* A flow table entry, possibly with two different versions. */
+struct fte {
+ struct cls_rule rule; /* Within a "struct classifier". */
+ struct fte_version *versions[2];
+};
+
+/* One version of a Flow Table Entry. */
+struct fte_version {
+ ovs_be64 cookie;
+ uint16_t idle_timeout;
+ uint16_t hard_timeout;
+ uint16_t flags;
+ union ofp_action *actions;
+ size_t n_actions;
+};
+
+/* Frees 'version' and the data that it owns. */
+static void
+fte_version_free(struct fte_version *version)
+{
+ if (version) {
+ free(version->actions);
+ free(version);
+ }
+}
+
+/* Returns true if 'a' and 'b' are the same, false if they differ.
+ *
+ * Ignores differences in 'flags' because there's no way to retrieve flags from
+ * an OpenFlow switch. We have to assume that they are the same. */
+static bool
+fte_version_equals(const struct fte_version *a, const struct fte_version *b)
+{
+ return (a->cookie == b->cookie
+ && a->idle_timeout == b->idle_timeout
+ && a->hard_timeout == b->hard_timeout
+ && a->n_actions == b->n_actions
+ && !memcmp(a->actions, b->actions,
+ a->n_actions * sizeof *a->actions));
+}
+
+/* Prints 'version' on stdout. Expects the caller to have printed the rule
+ * associated with the version. */
+static void
+fte_version_print(const struct fte_version *version)
+{
+ struct ds s;
+
+ if (version->cookie != htonll(0)) {
+ printf(" cookie=0x%"PRIx64, ntohll(version->cookie));
+ }
+ if (version->idle_timeout != OFP_FLOW_PERMANENT) {
+ printf(" idle_timeout=%"PRIu16, version->idle_timeout);
+ }
+ if (version->hard_timeout != OFP_FLOW_PERMANENT) {
+ printf(" hard_timeout=%"PRIu16, version->hard_timeout);
+ }
+
+ ds_init(&s);
+ ofp_print_actions(&s, (const struct ofp_action_header *) version->actions,
+ version->n_actions * sizeof *version->actions);
+ printf(" %s\n", ds_cstr(&s));
+ ds_destroy(&s);
+}
+
+static struct fte *
+fte_from_cls_rule(const struct cls_rule *cls_rule)
+{
+ return cls_rule ? CONTAINER_OF(cls_rule, struct fte, rule) : NULL;
+}
+
+/* Frees 'fte' and its versions. */
+static void
+fte_free(struct fte *fte)
+{
+ if (fte) {
+ fte_version_free(fte->versions[0]);
+ fte_version_free(fte->versions[1]);
+ free(fte);
+ }
+}
+
+/* Frees all of the FTEs within 'cls'. */
+static void
+fte_free_all(struct classifier *cls)
+{
+ struct cls_cursor cursor;
+ struct fte *fte, *next;
+
+ cls_cursor_init(&cursor, cls, NULL);
+ CLS_CURSOR_FOR_EACH_SAFE (fte, next, rule, &cursor) {
+ classifier_remove(cls, &fte->rule);
+ fte_free(fte);
+ }
+}
+
+/* Searches 'cls' for an FTE matching 'rule', inserting a new one if
+ * necessary. Sets 'version' as the version of that rule with the given
+ * 'index', replacing any existing version, if any.
+ *
+ * Takes ownership of 'version'. */
+static void
+fte_insert(struct classifier *cls, const struct cls_rule *rule,
+ struct fte_version *version, int index)
+{
+ struct fte *old, *fte;
+
+ fte = xzalloc(sizeof *fte);
+ fte->rule = *rule;
+ fte->versions[index] = version;
+
+ old = fte_from_cls_rule(classifier_replace(cls, &fte->rule));
+ if (old) {
+ fte_version_free(old->versions[index]);
+ fte->versions[!index] = old->versions[!index];
+ free(old);
+ }
+}
+
+/* Reads the flows in 'filename' as flow table entries in 'cls' for the version
+ * with the specified 'index'. Returns the minimum flow format required to
+ * represent the flows that were read. */
+static enum nx_flow_format
+read_flows_from_file(const char *filename, struct classifier *cls, int index)
+{
+ enum nx_flow_format min_flow_format;
+ struct ds s;
+ FILE *file;
+
+ file = !strcmp(filename, "-") ? stdin : fopen(filename, "r");
+ if (file == NULL) {
+ ovs_fatal(errno, "%s: open", filename);
+ }
+
+ ds_init(&s);
+ min_flow_format = NXFF_OPENFLOW10;
+ while (!ds_get_preprocessed_line(&s, file)) {
+ struct fte_version *version;
+ enum nx_flow_format min_ff;
+ struct ofpbuf actions;
+ struct flow_mod fm;
+
+ ofpbuf_init(&actions, 64);
+ parse_ofp_str(&fm, &actions, ds_cstr(&s));
+
+ version = xmalloc(sizeof *version);
+ version->cookie = fm.cookie;
+ version->idle_timeout = fm.idle_timeout;
+ version->hard_timeout = fm.hard_timeout;
+ version->flags = fm.flags & (OFPFF_SEND_FLOW_REM | OFPFF_EMERG);
+ version->n_actions = actions.size / sizeof *version->actions;
+ version->actions = ofpbuf_steal_data(&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);
+
+ fte_insert(cls, &fm.cr, version, index);
+ }
+ ds_destroy(&s);
+
+ if (file != stdin) {
+ fclose(file);
+ }
+
+ return min_flow_format;
+}
+
+/* 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
+ * version with the specified 'index'. */
+static void
+read_flows_from_switch(struct vconn *vconn, enum nx_flow_format flow_format,
+ struct classifier *cls, int index)
+{
+ struct flow_stats_request fsr;
+ struct ofpbuf *request;
+ ovs_be32 send_xid;
+ bool done;
+
+ fsr.aggregate = false;
+ cls_rule_init_catchall(&fsr.match, 0);
+ fsr.out_port = OFPP_NONE;
+ fsr.table_id = 0xff;
+ request = ofputil_encode_flow_stats_request(&fsr, flow_format);
+ send_xid = ((struct ofp_header *) request->data)->xid;
+ send_openflow_buffer(vconn, request);
+
+ done = false;
+ while (!done) {
+ ovs_be32 recv_xid;
+ struct ofpbuf *reply;
+
+ run(vconn_recv_block(vconn, &reply), "OpenFlow packet receive failed");
+ recv_xid = ((struct ofp_header *) reply->data)->xid;
+ if (send_xid == recv_xid) {
+ const struct ofputil_msg_type *type;
+ const struct ofp_stats_reply *osr;
+ enum ofputil_msg_code code;
+
+ ofputil_decode_msg_type(reply->data, &type);
+ code = ofputil_msg_type_code(type);
+ if (code != OFPUTIL_OFPST_FLOW_REPLY &&
+ code != OFPUTIL_NXST_FLOW_REPLY) {
+ ovs_fatal(0, "received bad reply: %s",
+ ofp_to_string(reply->data, reply->size,
+ verbosity + 1));
+ }
+
+ osr = reply->data;
+ if (!(osr->flags & htons(OFPSF_REPLY_MORE))) {
+ done = true;
+ }
+
+ for (;;) {
+ struct fte_version *version;
+ struct ofputil_flow_stats fs;
+ int retval;
+
+ retval = ofputil_decode_flow_stats_reply(&fs, reply);
+ if (retval) {
+ if (retval != EOF) {
+ ovs_fatal(0, "parse error in reply");
+ }
+ break;
+ }
+
+ version = xmalloc(sizeof *version);
+ version->cookie = fs.cookie;
+ version->idle_timeout = fs.idle_timeout;
+ version->hard_timeout = fs.hard_timeout;
+ version->flags = 0;
+ version->n_actions = fs.n_actions;
+ version->actions = xmemdup(fs.actions,
+ fs.n_actions * sizeof *fs.actions);
+
+ fte_insert(cls, &fs.rule, version, index);
+ }
+ } else {
+ VLOG_DBG("received reply with xid %08"PRIx32" "
+ "!= expected %08"PRIx32, recv_xid, send_xid);
+ }
+ ofpbuf_delete(reply);
+ }
+}
+
+static void
+fte_make_flow_mod(const struct fte *fte, int index, uint16_t command,
+ enum nx_flow_format flow_format, struct list *packets)
+{
+ const struct fte_version *version = fte->versions[index];
+ struct flow_mod fm;
+ struct ofpbuf *ofm;
+
+ fm.cr = fte->rule;
+ fm.cookie = version->cookie;
+ 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.flags = version->flags;
+ if (command == OFPFC_ADD || command == OFPFC_MODIFY ||
+ command == OFPFC_MODIFY_STRICT) {
+ fm.actions = version->actions;
+ fm.n_actions = version->n_actions;
+ } else {
+ fm.actions = NULL;
+ fm.n_actions = 0;
+ }
+
+ ofm = ofputil_encode_flow_mod(&fm, flow_format, false);
+ list_push_back(packets, &ofm->list_node);
+}
+
+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;
+ struct cls_cursor cursor;
+ struct classifier cls;
+ struct list requests;
+ struct vconn *vconn;
+ struct fte *fte;
+
+ classifier_init(&cls);
+ min_flow_format = read_flows_from_file(argv[2], &cls, FILE_IDX);
+
+ 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);
+
+ list_init(&requests);
+
+ /* Delete flows that exist on the switch but not in the file. */
+ cls_cursor_init(&cursor, &cls, NULL);
+ CLS_CURSOR_FOR_EACH (fte, rule, &cursor) {
+ struct fte_version *file_ver = fte->versions[FILE_IDX];
+ struct fte_version *sw_ver = fte->versions[SWITCH_IDX];
+
+ if (sw_ver && !file_ver) {
+ fte_make_flow_mod(fte, SWITCH_IDX, OFPFC_DELETE_STRICT,
+ flow_format, &requests);
+ }
+ }
+
+ /* Add flows that exist in the file but not on the switch.
+ * Update flows that exist in both places but differ. */
+ cls_cursor_init(&cursor, &cls, NULL);
+ CLS_CURSOR_FOR_EACH (fte, rule, &cursor) {
+ struct fte_version *file_ver = fte->versions[FILE_IDX];
+ struct fte_version *sw_ver = fte->versions[SWITCH_IDX];
+
+ if (file_ver && (!sw_ver || !fte_version_equals(sw_ver, file_ver))) {
+ fte_make_flow_mod(fte, FILE_IDX, OFPFC_ADD, flow_format,
+ &requests);
+ }
+ }
+ transact_multiple_noreply(vconn, &requests);
+ vconn_close(vconn);
+
+ fte_free_all(&cls);
+}
+
+static void
+read_flows_from_source(const char *source, struct classifier *cls, int index)
+{
+ struct stat s;
+
+ if (source[0] == '/' || source[0] == '.'
+ || (!strchr(source, ':') && !stat(source, &s))) {
+ read_flows_from_file(source, cls, index);
+ } else {
+ enum nx_flow_format flow_format;
+ 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);
+ vconn_close(vconn);
+ }
+}
+
+static void
+do_diff_flows(int argc OVS_UNUSED, char *argv[])
+{
+ bool differences = false;
+ struct cls_cursor cursor;
+ struct classifier cls;
+ struct fte *fte;
+
+ classifier_init(&cls);
+ read_flows_from_source(argv[1], &cls, 0);
+ read_flows_from_source(argv[2], &cls, 1);
+
+ cls_cursor_init(&cursor, &cls, NULL);
+ CLS_CURSOR_FOR_EACH (fte, rule, &cursor) {
+ struct fte_version *a = fte->versions[0];
+ struct fte_version *b = fte->versions[1];
+
+ if (!a || !b || !fte_version_equals(a, b)) {
+ char *rule_s = cls_rule_to_string(&fte->rule);
+ if (a) {
+ printf("-%s", rule_s);
+ fte_version_print(a);
+ }
+ if (b) {
+ printf("+%s", rule_s);
+ fte_version_print(b);
+ }
+ free(rule_s);
+
+ differences = true;
+ }
+ }
+
+ fte_free_all(&cls);
+
+ if (differences) {
+ exit(2);
+ }
+}
+\f
+/* Undocumented commands for unit testing. */
+
+static void
+print_packet_list(struct list *packets)
+{
+ struct ofpbuf *packet, *next;
+
+ 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);
+ }
+}
+
+/* "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;
+ 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;
+
+ list_init(&packets);
+ parse_ofp_flow_mod_str(&packets, &flow_format, &flow_mod_table_id,
+ 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;
+ bool flow_mod_table_id;
+ 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;
+ }
+ 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-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;
+ }
+ if (strchr(s, '#')) {
+ *strchr(s, '#') = '\0';
+ }
+ if (s[strspn(s, " ")] == '\0') {
+ putchar('\n');
+ continue;
+ }
+
+ /* Convert string to nx_match. */
+ ofpbuf_init(&nx_match, 0);
+ match_len = nx_match_from_string(ds_cstr(&in), &nx_match);
+
+ /* 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);
+ }
+
+ 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_ofp_print(int argc, char *argv[])
+{
+ 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 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 },
+ { "replace-flows", 2, 2, do_replace_flows },
+ { "diff-flows", 2, 2, do_diff_flows },
+ { "dump-ports", 1, 2, do_dump_ports },
{ "mod-port", 3, 3, do_mod_port },
{ "probe", 1, 1, do_probe },
{ "ping", 1, 2, do_ping },
{ "benchmark", 3, 3, do_benchmark },
{ "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 },
};
git://git.onelab.eu / sliver-openvswitch.git / blobdiff