X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fdpctl.c;h=224c7cafc92ebea89d316422cec9d88f373ed715;hb=7bee00fad99b301693c11f0538cb5cff2f3a9397;hp=fa1d6f9f1dc545ac1abd7f623f95a7db2900eba9;hpb=f1bfddabdb5beeac7893408988c4b423a8226c7d;p=sliver-openvswitch.git

diff --git a/utilities/dpctl.c b/utilities/dpctl.c
index fa1d6f9f1..224c7cafc 100644
--- a/utilities/dpctl.c
+++ b/utilities/dpctl.c
@@ -31,6 +31,7 @@
  * derivatives without specific, written prior permission.
  */
 
+#include <config.h>
 #include <errno.h>
 #include <getopt.h>
 #include <inttypes.h>
@@ -53,12 +54,17 @@
 #include "socket-util.h"
 #include "openflow.h"
 #include "ofp-print.h"
+#include "random.h"
+#include "signal.h"
 #include "vconn.h"
 #include "vconn-ssl.h"
 
 #include "vlog.h"
 #define THIS_MODULE VLM_dpctl
 
+#define DEFAULT_IDLE_TIMEOUT 60
+#define MAX_ADD_ACTS 5
+
 static const char* ifconfigbin = "/sbin/ifconfig";
 
 struct command {
@@ -110,6 +116,7 @@ static void
 parse_options(int argc, char *argv[])
 {
     static struct option long_options[] = {
+        {"timeout", required_argument, 0, 't'},
         {"verbose", optional_argument, 0, 'v'},
         {"help", no_argument, 0, 'h'},
         {"version", no_argument, 0, 'V'},
@@ -119,15 +126,30 @@ parse_options(int argc, char *argv[])
     char *short_options = long_options_to_short_options(long_options);
 
     for (;;) {
-        int indexptr;
+        unsigned long int timeout;
         int c;
 
-        c = getopt_long(argc, argv, short_options, long_options, &indexptr);
+        c = getopt_long(argc, argv, short_options, long_options, NULL);
         if (c == -1) {
             break;
         }
 
         switch (c) {
+        case 't':
+            timeout = strtoul(optarg, NULL, 10);
+            if (timeout <= 0) {
+                fatal(0, "value %s on -t or --timeout is not at least 1",
+                      optarg);
+            } else if (timeout < UINT_MAX) {
+                /* Add 1 because historical implementations allow an alarm to
+                 * occur up to a second early. */
+                alarm(timeout + 1);
+            } else {
+                alarm(UINT_MAX);
+            }
+            signal(SIGALRM, SIG_DFL);
+            break;
+
         case 'h':
             usage();
 
@@ -157,26 +179,34 @@ usage(void)
     printf("%s: OpenFlow switch management utility\n"
            "usage: %s [OPTIONS] COMMAND [ARG...]\n"
 #ifdef HAVE_NETLINK
-           "\nCommands that apply to local datapaths only:\n"
+           "\nFor local datapaths only:\n"
            "  adddp nl:DP_ID              add a new local datapath DP_ID\n"
            "  deldp nl:DP_ID              delete local datapath DP_ID\n"
            "  addif nl:DP_ID IFACE        add IFACE as a port on DP_ID\n"
            "  delif nl:DP_ID IFACE        delete IFACE as a port on DP_ID\n"
            "  monitor nl:DP_ID            print packets received\n"
-           "  benchmark-nl nl:DP_ID N SIZE   send N packets of SIZE bytes\n"
 #endif
-           "\nCommands that apply to local datapaths and remote switches:\n"
+           "\nFor local datapaths and remote switches:\n"
            "  show SWITCH                 show information\n"
            "  dump-tables SWITCH          print table stats\n"
            "  dump-ports SWITCH           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"
+           "  add-flow SWITCH FLOW        add flow described by FLOW\n"
            "  add-flows SWITCH FILE       add flows from FILE\n"
            "  del-flows SWITCH FLOW       delete matching FLOWs\n"
+           "\nFor local datapaths, remote switches, and controllers:\n"
+           "  probe VCONN                 probe whether VCONN is up\n"
+           "  ping VCONN [N]              latency of N-byte echos\n"
+           "  benchmark VCONN N COUNT     bandwidth of COUNT N-byte echos\n"
            "where each SWITCH is an active OpenFlow connection method.\n",
            program_name, program_name);
     vconn_usage(true, false);
     printf("\nOptions:\n"
+           "  -t, --timeout=SECS          give up after SECS seconds\n"
+           "  -v, --verbose=MODULE[:FACILITY[:LEVEL]]  set logging levels\n"
            "  -v, --verbose               set maximum verbosity level\n"
            "  -h, --help                  display this help message\n"
            "  -V, --version               display version information\n");
@@ -262,7 +292,7 @@ static void do_del_port(int argc UNUSED, char *argv[])
 static void do_monitor(int argc UNUSED, char *argv[])
 {
     struct dpif dp;
-    open_nl_vconn(argv[1], false, &dp);
+    open_nl_vconn(argv[1], true, &dp);
     for (;;) {
         struct buffer *b;
         run(dpif_recv_openflow(&dp, &b, true), "dpif_recv_openflow");
@@ -270,138 +300,100 @@ static void do_monitor(int argc UNUSED, char *argv[])
         buffer_delete(b);
     }
 }
-
-#define BENCHMARK_INCR   100
-
-static void do_benchmark_nl(int argc UNUSED, char *argv[])
-{
-    struct dpif dp;
-    uint32_t num_packets, i, milestone;
-    struct timeval start, end;
-
-    open_nl_vconn(argv[1], false, &dp);
-    num_packets = atoi(argv[2]);
-    milestone = BENCHMARK_INCR;
-    run(dpif_benchmark_nl(&dp, num_packets, atoi(argv[3])), "benchmark_nl");
-    if (gettimeofday(&start, NULL) == -1) {
-        run(errno, "gettimeofday");
-    }
-    for (i = 0; i < num_packets;i++) {
-        struct buffer *b;
-        run(dpif_recv_openflow(&dp, &b, true), "dpif_recv_openflow");
-        if (i == milestone) {
-            gettimeofday(&end, NULL);
-            printf("%u packets received in %f ms\n",
-                   BENCHMARK_INCR,
-                   (1000*(double)(end.tv_sec - start.tv_sec))
-                   + (.001*(end.tv_usec - start.tv_usec)));
-            milestone += BENCHMARK_INCR;
-            start = end;
-        }
-        buffer_delete(b);
-    }
-    gettimeofday(&end, NULL);
-    printf("%u packets received in %f ms\n",
-           i - (milestone - BENCHMARK_INCR),
-           (1000*(double)(end.tv_sec - start.tv_sec))
-           + (.001*(end.tv_usec - start.tv_usec)));
-
-    dpif_close(&dp);
-}
 #endif /* HAVE_NETLINK */
 
 /* Generic commands. */
 
-static uint32_t
-random_xid(void)
-{
-    static bool inited = false;
-    if (!inited) {
-        struct timeval tv;
-        inited = true;
-        if (gettimeofday(&tv, NULL) < 0) {
-            fatal(errno, "gettimeofday");
-        }
-        srand(tv.tv_sec ^ tv.tv_usec);
-    }
-    return rand();
-}
-
 static void *
-alloc_openflow_buffer(size_t openflow_len, uint8_t type,
-                      struct buffer **bufferp)
+alloc_stats_request(size_t body_len, uint16_t type, struct buffer **bufferp)
 {
-	struct buffer *buffer;
-	struct ofp_header *oh;
-
-	buffer = *bufferp = buffer_new(openflow_len);
-	oh = buffer_put_uninit(buffer, openflow_len);
-    memset(oh, 0, openflow_len);
-	oh->version = OFP_VERSION;
-	oh->type = type;
-	oh->length = 0;
-	oh->xid = random_xid();
-	return oh;
+    struct ofp_stats_request *rq;
+    rq = make_openflow((offsetof(struct ofp_stats_request, body)
+                        + body_len), OFPT_STATS_REQUEST, bufferp);
+    rq->type = htons(type);
+    rq->flags = htons(0);
+    return rq->body;
 }
 
 static void
 send_openflow_buffer(struct vconn *vconn, struct buffer *buffer)
 {
-    struct ofp_header *oh;
+    update_openflow_length(buffer);
+    run(vconn_send_block(vconn, buffer), "failed to send packet to switch");
+}
 
-    oh = buffer_at_assert(buffer, 0, sizeof *oh);
-    oh->length = htons(buffer->size);
+static void
+dump_transaction(const char *vconn_name, struct buffer *request)
+{
+    struct vconn *vconn;
+    struct buffer *reply;
 
-    run(vconn_send_block(vconn, buffer), "failed to send packet to switch");
+    update_openflow_length(request);
+    run(vconn_open_block(vconn_name, &vconn), "connecting to %s", vconn_name);
+    run(vconn_transact(vconn, request, &reply), "talking to %s", vconn_name);
+    ofp_print(stdout, reply->data, reply->size, 1);
+    vconn_close(vconn);
+}
+
+static void
+dump_trivial_transaction(const char *vconn_name, uint8_t request_type)
+{
+    struct buffer *request;
+    make_openflow(sizeof(struct ofp_header), request_type, &request);
+    dump_transaction(vconn_name, request);
 }
 
-static struct buffer *
-transact_openflow(struct vconn *vconn, struct buffer *request)
+static void
+dump_stats_transaction(const char *vconn_name, struct buffer *request)
 {
     uint32_t send_xid = ((struct ofp_header *) request->data)->xid;
+    struct vconn *vconn;
+    bool done = false;
 
+    run(vconn_open_block(vconn_name, &vconn), "connecting to %s", vconn_name);
     send_openflow_buffer(vconn, request);
-    for (;;) {
+    while (!done) {
         uint32_t recv_xid;
         struct buffer *reply;
 
         run(vconn_recv_block(vconn, &reply), "OpenFlow packet receive failed");
         recv_xid = ((struct ofp_header *) reply->data)->xid;
         if (send_xid == recv_xid) {
-            return reply;
-        }
+            struct ofp_stats_reply *osr;
+
+            ofp_print(stdout, reply->data, reply->size, 1);
 
-        VLOG_DBG("received reply with xid %08"PRIx32" != expected %08"PRIx32,
-                 recv_xid, send_xid);
+            osr = buffer_at(reply, 0, sizeof *osr);
+            done = !osr || !(ntohs(osr->flags) & OFPSF_REPLY_MORE);
+        } else {
+            VLOG_DBG("received reply with xid %08"PRIx32" "
+                     "!= expected %08"PRIx32, recv_xid, send_xid);
+        }
         buffer_delete(reply);
     }
+    vconn_close(vconn);
 }
 
 static void
-dump_transaction(const char *vconn_name, uint8_t request_type)
+dump_trivial_stats_transaction(const char *vconn_name, uint8_t stats_type)
 {
-    struct vconn *vconn;
-    struct buffer *request, *reply;
-
-    run(vconn_open_block(vconn_name, &vconn), "connecting to %s", vconn_name);
-    alloc_openflow_buffer(sizeof(struct ofp_header), request_type, &request);
-    reply = transact_openflow(vconn, request);
-    ofp_print(stdout, reply->data, reply->size, 1);
-    vconn_close(vconn);
+    struct buffer *request;
+    alloc_stats_request(0, stats_type, &request);
+    dump_stats_transaction(vconn_name, request);
 }
 
 static void
 do_show(int argc UNUSED, char *argv[])
 {
-    dump_transaction(argv[1], OFPT_FEATURES_REQUEST);
-    dump_transaction(argv[1], OFPT_GET_CONFIG_REQUEST);
+    dump_trivial_transaction(argv[1], OFPT_FEATURES_REQUEST);
+    dump_trivial_transaction(argv[1], OFPT_GET_CONFIG_REQUEST);
 }
 
 
 static void
 do_dump_tables(int argc, char *argv[])
 {
-    dump_transaction(argv[1], OFPT_TABLE_STATS_REQUEST);
+    dump_trivial_stats_transaction(argv[1], OFPST_TABLE);
 }
 
 
@@ -438,26 +430,76 @@ str_to_ip(const char *str, uint32_t *ip)
 }
 
 static void
-str_to_action(const char *str, struct ofp_action *action) 
+str_to_action(char *str, struct ofp_action *action, int *n_actions) 
 {
     uint16_t port;
+    int i;
+    int max_actions = *n_actions;
+    char *act, *arg;
+    char *saveptr = NULL;
+    
+    memset(action, 0, sizeof(*action) * max_actions);
+    for (i=0, act = strtok_r(str, ", \t\r\n", &saveptr); 
+         i<max_actions && act;
+         i++, act = strtok_r(NULL, ", \t\r\n", &saveptr)) 
+    {
+        port = OFPP_MAX;
+
+        /* Arguments are separated by colons */
+        arg = strchr(act, ':');
+        if (arg) {
+            *arg = '\0';
+            arg++;
+        } 
+
+        if (!strcasecmp(act, "mod_vlan")) {
+            action[i].type = htons(OFPAT_SET_DL_VLAN);
+
+            if (!strcasecmp(arg, "strip")) {
+                action[i].arg.vlan_id = htons(OFP_VLAN_NONE);
+            } else {
+                action[i].arg.vlan_id = htons(str_to_int(arg));
+            }
+        } else if (!strcasecmp(act, "output")) {
+            port = str_to_int(arg);
+        } else if (!strcasecmp(act, "TABLE")) {
+            port = OFPP_TABLE;
+        } else if (!strcasecmp(act, "NORMAL")) {
+            port = OFPP_NORMAL;
+        } else if (!strcasecmp(act, "FLOOD")) {
+            port = OFPP_FLOOD;
+        } else if (!strcasecmp(act, "ALL")) {
+            port = OFPP_ALL;
+        } else if (!strcasecmp(act, "CONTROLLER")) {
+            port = OFPP_CONTROLLER;
+            if (arg) {
+                if (!strcasecmp(arg, "all")) {
+                    action[i].arg.output.max_len= htons(0);
+                } else {
+                    action[i].arg.output.max_len= htons(str_to_int(arg));
+                }
+            }
+        } else if (!strcasecmp(act, "LOCAL")) {
+            port = OFPP_LOCAL;
+        } else if (strspn(act, "0123456789") == strlen(act)) {
+            port = str_to_int(act);
+        } else {
+            fatal(0, "Unknown action: %s", act);
+        }
 
-    if (!strcasecmp(str, "flood")) {
-        port = OFPP_FLOOD;
-    } else if (!strcasecmp(str, "controller")) {
-        port = OFPP_CONTROLLER;
-    } else {
-        port = str_to_int(str);
+        if (port != OFPP_MAX) {
+            action[i].type = htons(OFPAT_OUTPUT);
+            action[i].arg.output.port = htons(port);
+        }
     }
 
-    memset(action, 0, sizeof *action);
-    action->type = OFPAT_OUTPUT;
-    action->arg.output.port = htons(port);
+    *n_actions = i;
 }
 
 static void
-str_to_flow(char *string, struct ofp_match *match, struct ofp_action *action,
-            uint8_t *table_idx, uint16_t *priority)
+str_to_flow(char *string, struct ofp_match *match, 
+        struct ofp_action *action, int *n_actions, uint8_t *table_idx, 
+            uint16_t *priority, uint16_t *idle_timeout, uint16_t *hard_timeout)
 {
     struct field {
         const char *name;
@@ -482,26 +524,45 @@ str_to_flow(char *string, struct ofp_match *match, struct ofp_action *action,
 
     char *name, *value;
     uint32_t wildcards;
-    bool got_action = false;
+    char *act_str;
 
     if (table_idx) {
         *table_idx = 0xff;
     }
+    if (priority) {
+        *priority = OFP_DEFAULT_PRIORITY;
+    }
+    if (idle_timeout) {
+        *idle_timeout = DEFAULT_IDLE_TIMEOUT;
+    }
+    if (hard_timeout) {
+        *hard_timeout = OFP_FLOW_PERMANENT;
+    }
+    if (action) {
+        act_str = strstr(string, "action");
+        if (!act_str) {
+            fatal(0, "must specify an action");
+        }
+        *(act_str-1) = '\0';
+
+        act_str = strchr(act_str, '=');
+        if (!act_str) {
+            fatal(0, "must specify an action");
+        }
+
+        act_str++;
+
+        str_to_action(act_str, action, n_actions);
+    }
     memset(match, 0, sizeof *match);
     wildcards = OFPFW_ALL;
-    for (name = strtok(string, "="), value = strtok(NULL, " \t\n");
+    for (name = strtok(string, "="), value = strtok(NULL, ", \t\r\n");
          name && value;
-         name = strtok(NULL, "="), value = strtok(NULL, " \t\n"))
+         name = strtok(NULL, "="), value = strtok(NULL, ", \t\r\n"))
     {
         const struct field *f;
         void *data;
 
-        if (action && !strcmp(name, "action")) {
-            got_action = true;
-            str_to_action(value, action);
-            continue;
-        }
-
         if (table_idx && !strcmp(name, "table")) {
             *table_idx = atoi(value);
             continue;
@@ -512,6 +573,16 @@ str_to_flow(char *string, struct ofp_match *match, struct ofp_action *action,
             continue;
         }
 
+        if (idle_timeout && !strcmp(name, "idle_timeout")) {
+            *idle_timeout = atoi(value);
+            continue;
+        }
+
+        if (hard_timeout && !strcmp(name, "hard_timeout")) {
+            *hard_timeout = atoi(value);
+            continue;
+        }
+
         for (f = fields; f < &fields[ARRAY_SIZE(fields)]; f++) {
             if (!strcmp(f->name, name)) {
                 goto found;
@@ -530,7 +601,7 @@ str_to_flow(char *string, struct ofp_match *match, struct ofp_action *action,
 
     found:
         data = (char *) match + f->offset;
-        if (!strcmp(value, "*")) {
+        if (!strcmp(value, "*") || !strcmp(value, "ANY")) {
             wildcards |= f->wildcard;
         } else {
             wildcards &= ~f->wildcard;
@@ -550,26 +621,62 @@ str_to_flow(char *string, struct ofp_match *match, struct ofp_action *action,
     if (name && !value) {
         fatal(0, "field %s missing value", name);
     }
-    if (action && !got_action) {
-        fatal(0, "must specify an action");
-    }
     match->wildcards = htons(wildcards);
 }
 
 static void do_dump_flows(int argc, char *argv[])
+{
+    struct ofp_flow_stats_request *req;
+    struct buffer *request;
+
+    req = alloc_stats_request(sizeof *req, OFPST_FLOW, &request);
+    str_to_flow(argc > 2 ? argv[2] : "", &req->match, NULL, 0, 
+                &req->table_id, NULL, NULL, NULL);
+    memset(req->pad, 0, sizeof req->pad);
+
+    dump_stats_transaction(argv[1], request);
+}
+
+static void do_dump_aggregate(int argc, char *argv[])
+{
+    struct ofp_aggregate_stats_request *req;
+    struct buffer *request;
+
+    req = alloc_stats_request(sizeof *req, OFPST_AGGREGATE, &request);
+    str_to_flow(argc > 2 ? argv[2] : "", &req->match, NULL, 0,
+                &req->table_id, NULL, NULL, NULL);
+    memset(req->pad, 0, sizeof req->pad);
+
+    dump_stats_transaction(argv[1], request);
+}
+
+static void do_add_flow(int argc, char *argv[])
 {
     struct vconn *vconn;
-    struct buffer *request, *reply;
-    struct ofp_flow_stats_request *fsr;
+    struct buffer *buffer;
+    struct ofp_flow_mod *ofm;
+    uint16_t priority, idle_timeout, hard_timeout;
+    size_t size;
+    int n_actions = MAX_ADD_ACTS;
 
     run(vconn_open_block(argv[1], &vconn), "connecting to %s", argv[1]);
-    fsr = alloc_openflow_buffer(sizeof *fsr, OFPT_FLOW_STATS_REQUEST, &request);
-    str_to_flow(argc > 2 ? argv[2] : "", &fsr->match, NULL, &fsr->table_id, 
-            NULL);
-    fsr->type = OFPFS_INDIV;
-    fsr->pad = 0;
-    reply = transact_openflow(vconn, request);
-    ofp_print(stdout, reply->data, reply->size, 1);
+
+    /* Parse and send. */
+    size = sizeof *ofm + (sizeof ofm->actions[0] * MAX_ADD_ACTS);
+    ofm = make_openflow(size, OFPT_FLOW_MOD, &buffer);
+    str_to_flow(argv[2], &ofm->match, &ofm->actions[0], &n_actions, 
+                NULL, &priority, &idle_timeout, &hard_timeout);
+    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);
+
+    /* xxx Should we use the buffer library? */
+    buffer->size -= (MAX_ADD_ACTS - n_actions) * sizeof ofm->actions[0];
+
+    send_openflow_buffer(vconn, buffer);
     vconn_close(vconn);
 }
 
@@ -589,8 +696,9 @@ static void do_add_flows(int argc, char *argv[])
     while (fgets(line, sizeof line, file)) {
         struct buffer *buffer;
         struct ofp_flow_mod *ofm;
-        uint16_t priority=0;
+        uint16_t priority, idle_timeout, hard_timeout;
         size_t size;
+        int n_actions = MAX_ADD_ACTS;
 
         char *comment;
 
@@ -606,14 +714,19 @@ static void do_add_flows(int argc, char *argv[])
         }
 
         /* Parse and send. */
-        size = sizeof *ofm + sizeof ofm->actions[0];
-        ofm = alloc_openflow_buffer(size, OFPT_FLOW_MOD, &buffer);
+        size = sizeof *ofm + (sizeof ofm->actions[0] * MAX_ADD_ACTS);
+        ofm = make_openflow(size, OFPT_FLOW_MOD, &buffer);
+        str_to_flow(line, &ofm->match, &ofm->actions[0], &n_actions, 
+                    NULL, &priority, &idle_timeout, &hard_timeout);
         ofm->command = htons(OFPFC_ADD);
-        ofm->max_idle = htons(50);
+        ofm->idle_timeout = htons(idle_timeout);
+        ofm->hard_timeout = htons(hard_timeout);
         ofm->buffer_id = htonl(UINT32_MAX);
-        ofm->group_id = htonl(0);
-        str_to_flow(line, &ofm->match, &ofm->actions[0], NULL, &priority);
         ofm->priority = htons(priority);
+        ofm->reserved = htonl(0);
+
+        /* xxx Should we use the buffer library? */
+        buffer->size -= (MAX_ADD_ACTS - n_actions) * sizeof ofm->actions[0];
 
         send_openflow_buffer(vconn, buffer);
     }
@@ -624,6 +737,7 @@ static void do_add_flows(int argc, char *argv[])
 static void do_del_flows(int argc, char *argv[])
 {
     struct vconn *vconn;
+    uint16_t priority;
 
     run(vconn_open_block(argv[1], &vconn), "connecting to %s", argv[1]);
     struct buffer *buffer;
@@ -633,13 +747,15 @@ static void do_del_flows(int argc, char *argv[])
 
     /* Parse and send. */
     size = sizeof *ofm;
-    ofm = alloc_openflow_buffer(size, OFPT_FLOW_MOD, &buffer);
+    ofm = make_openflow(size, OFPT_FLOW_MOD, &buffer);
+    str_to_flow(argc > 2 ? argv[2] : "", &ofm->match, NULL, 0, NULL, 
+                &priority, NULL, NULL);
     ofm->command = htons(OFPFC_DELETE);
-    ofm->max_idle = 0;
+    ofm->idle_timeout = htons(0);
+    ofm->hard_timeout = htons(0);
     ofm->buffer_id = htonl(UINT32_MAX);
-    ofm->group_id = 0;
-    ofm->priority = 0;
-    str_to_flow(argc > 2 ? argv[2] : "", &ofm->match, NULL, NULL, NULL);
+    ofm->priority = htons(priority);
+    ofm->reserved = htonl(0);
 
     send_openflow_buffer(vconn, buffer);
 
@@ -649,7 +765,114 @@ static void do_del_flows(int argc, char *argv[])
 static void
 do_dump_ports(int argc, char *argv[])
 {
-    dump_transaction(argv[1], OFPT_PORT_STATS_REQUEST);
+    dump_trivial_stats_transaction(argv[1], OFPST_PORT);
+}
+
+static void
+do_probe(int argc, char *argv[])
+{
+    struct buffer *request;
+    struct vconn *vconn;
+    struct buffer *reply;
+
+    make_openflow(sizeof(struct ofp_header), OFPT_ECHO_REQUEST, &request);
+    run(vconn_open_block(argv[1], &vconn), "connecting to %s", argv[1]);
+    run(vconn_transact(vconn, request, &reply), "talking to %s", argv[1]);
+    if (reply->size != request->size) {
+        fatal(0, "reply does not match request");
+    }
+    buffer_delete(reply);
+    vconn_close(vconn);
+}
+
+static void
+do_ping(int argc, char *argv[])
+{
+    size_t max_payload = 65535 - sizeof(struct ofp_header);
+    unsigned int payload;
+    struct vconn *vconn;
+    int i;
+
+    payload = argc > 2 ? atoi(argv[2]) : 64;
+    if (payload > max_payload) {
+        fatal(0, "payload must be between 0 and %zu bytes", max_payload);
+    }
+
+    run(vconn_open_block(argv[1], &vconn), "connecting to %s", argv[1]);
+    for (i = 0; i < 10; i++) {
+        struct timeval start, end;
+        struct buffer *request, *reply;
+        struct ofp_header *rq_hdr, *rpy_hdr;
+
+        rq_hdr = make_openflow(sizeof(struct ofp_header) + payload,
+                               OFPT_ECHO_REQUEST, &request);
+        random_bytes(rq_hdr + 1, payload);
+
+        gettimeofday(&start, NULL);
+        run(vconn_transact(vconn, buffer_clone(request), &reply), "transact");
+        gettimeofday(&end, NULL);
+
+        rpy_hdr = reply->data;
+        if (reply->size != request->size
+            || memcmp(rpy_hdr + 1, rq_hdr + 1, payload)
+            || 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);
+            printf("Reply:\n");
+            ofp_print(stdout, reply, reply->size, 2);
+        }
+        printf("%d bytes from %s: xid=%08"PRIx32" time=%.1f ms\n",
+               reply->size - sizeof *rpy_hdr, argv[1], rpy_hdr->xid,
+                   (1000*(double)(end.tv_sec - start.tv_sec))
+                   + (.001*(end.tv_usec - start.tv_usec)));
+        buffer_delete(request);
+        buffer_delete(reply);
+    }
+    vconn_close(vconn);
+}
+
+static void
+do_benchmark(int argc, char *argv[])
+{
+    size_t max_payload = 65535 - sizeof(struct ofp_header);
+    struct timeval start, end;
+    unsigned int payload_size, message_size;
+    struct vconn *vconn;
+    double duration;
+    int count;
+    int i;
+
+    payload_size = atoi(argv[2]);
+    if (payload_size > max_payload) {
+        fatal(0, "payload must be between 0 and %zu bytes", max_payload);
+    }
+    message_size = sizeof(struct ofp_header) + payload_size;
+
+    count = atoi(argv[3]);
+
+    printf("Sending %d packets * %u bytes (with header) = %u bytes total\n",
+           count, message_size, count * message_size);
+
+    run(vconn_open_block(argv[1], &vconn), "connecting to %s", argv[1]);
+    gettimeofday(&start, NULL);
+    for (i = 0; i < count; i++) {
+        struct buffer *request, *reply;
+        struct ofp_header *rq_hdr;
+
+        rq_hdr = make_openflow(message_size, OFPT_ECHO_REQUEST, &request);
+        memset(rq_hdr + 1, 0, payload_size);
+        run(vconn_transact(vconn, request, &reply), "transact");
+        buffer_delete(reply);
+    }
+    gettimeofday(&end, NULL);
+    vconn_close(vconn);
+
+    duration = ((1000*(double)(end.tv_sec - start.tv_sec))
+                + (.001*(end.tv_usec - start.tv_usec)));
+    printf("Finished in %.1f ms (%.0f packets/s) (%.0f bytes/s)\n",
+           duration, count / (duration / 1000.0),
+           count * message_size / (duration / 1000.0));
 }
 
 static void do_help(int argc UNUSED, char *argv[] UNUSED)
@@ -663,7 +886,6 @@ static struct command all_commands[] = {
     { "deldp", 1, 1, do_del_dp },
     { "addif", 2, 2, do_add_port },
     { "delif", 2, 2, do_del_port },
-    { "benchmark-nl", 3, 3, do_benchmark_nl },
 #endif
 
     { "show", 1, 1, do_show },
@@ -672,7 +894,13 @@ static struct command all_commands[] = {
     { "monitor", 1, 1, do_monitor },
     { "dump-tables", 1, 1, do_dump_tables },
     { "dump-flows", 1, 2, do_dump_flows },
+    { "dump-aggregate", 1, 2, do_dump_aggregate },
+    { "add-flow", 2, 2, do_add_flow },
     { "add-flows", 2, 2, do_add_flows },
     { "del-flows", 1, 2, do_del_flows },
     { "dump-ports", 1, 1, do_dump_ports },
+    { "probe", 1, 1, do_probe },
+    { "ping", 1, 2, do_ping },
+    { "benchmark", 3, 3, do_benchmark },
+    { NULL, 0, 0, NULL },
 };