X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fdpctl.c;h=bd89065d698ea0708b5ac6386b43a0605a873e25;hb=57d52057650716ee354ebbe588d2a884ccabc81f;hp=8f1e77238d5e37879b23ea2e94d054a555b3da27;hpb=a14c841f32358e665b19b419c91c1f711e4b0431;p=sliver-openvswitch.git diff --git a/utilities/dpctl.c b/utilities/dpctl.c index 8f1e77238..bd89065d6 100644 --- a/utilities/dpctl.c +++ b/utilities/dpctl.c @@ -31,34 +31,50 @@ * derivatives without specific, written prior permission. */ +#include +#include #include #include #include #include +#include +#include #include #include #include #include -#include "command-line.h" -#include "compiler.h" -#include "buffer.h" -#include "dpif.h" #ifdef HAVE_NETLINK +#include "netdev.h" #include "netlink.h" #include "openflow-netlink.h" #endif -#include "util.h" -#include "socket-util.h" -#include "openflow.h" + +#include "buffer.h" +#include "command-line.h" +#include "compiler.h" +#include "dpif.h" +#include "nicira-ext.h" #include "ofp-print.h" -#include "vconn.h" +#include "openflow.h" +#include "packets.h" +#include "random.h" +#include "socket-util.h" +#include "timeval.h" +#include "util.h" #include "vconn-ssl.h" +#include "vconn.h" #include "vlog.h" -#define THIS_MODULE VLM_DPCTL +#define THIS_MODULE VLM_dpctl -static const char* ifconfigbin = "/sbin/ifconfig"; +#define DEFAULT_IDLE_TIMEOUT 60 +#define MAX_ADD_ACTS 5 + +#define MOD_PORT_CMD_UP "up" +#define MOD_PORT_CMD_DOWN "down" +#define MOD_PORT_CMD_FLOOD "flood" +#define MOD_PORT_CMD_NOFLOOD "noflood" struct command { const char *name; @@ -77,8 +93,10 @@ int main(int argc, char *argv[]) struct command *p; set_program_name(argv[0]); + time_init(); vlog_init(); parse_options(argc, argv); + signal(SIGPIPE, SIG_IGN); argc -= optind; argv += optind; @@ -109,28 +127,35 @@ 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'}, -#ifdef HAVE_OPENSSL - {"private-key", required_argument, 0, 'p'}, - {"certificate", required_argument, 0, 'c'}, - {"ca-cert", required_argument, 0, 'C'}, -#endif + VCONN_SSL_LONG_OPTIONS {0, 0, 0, 0}, }; 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 { + time_alarm(timeout); + } + break; + case 'h': usage(); @@ -142,19 +167,7 @@ parse_options(int argc, char *argv[]) vlog_set_verbosity(optarg); break; -#ifdef HAVE_OPENSSL - case 'p': - vconn_ssl_set_private_key_file(optarg); - break; - - case 'c': - vconn_ssl_set_certificate_file(optarg); - break; - - case 'C': - vconn_ssl_set_ca_cert_file(optarg); - break; -#endif + VCONN_SSL_OPTION_HANDLERS case '?': exit(EXIT_FAILURE); @@ -172,46 +185,80 @@ 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" - " benchmark-nl nl:DP_ID N SIZE send N packets of SIZE bytes\n" + " addif nl:DP_ID IFACE... add each IFACE as a port on DP_ID\n" + " delif nl:DP_ID IFACE... delete each IFACE from DP_ID\n" #endif - "\nCommands that apply to local datapaths and remote switches:\n" - " show METHOD show information about METHOD\n" - " monitor METHOD print packets received on METHOD\n" - " dump-tables METHOD print table stats for METHOD\n" - " dump-flows METHOD T_ID print all flow entries in table T_ID of METHOD\n" - " dump-flows METHOD T_ID FLOW print matching FLOWs in table T_ID of METHOD\n" - " add-flows METHOD FILE add flows from FILE to METHOD\n" - "where each METHOD is an active OpenFlow connection method.\n", + "\nFor local datapaths and remote switches:\n" + " show SWITCH show basic 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-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" + " mod-flows SWITCH FLOW modify actions of matching FLOWs\n" + " del-flows SWITCH [FLOW] delete matching FLOWs\n" + " monitor SWITCH print packets received from SWITCH\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"); exit(EXIT_SUCCESS); } -static void run(int retval, const char *name) +static void run(int retval, const char *message, ...) + PRINTF_FORMAT(2, 3); + +static void run(int retval, const char *message, ...) { if (retval) { - fatal(retval, "%s", name); + 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); } } #ifdef HAVE_NETLINK /* Netlink-only commands. */ -static int if_up(const char* intf) +static int if_up(const char *netdev_name) { - char command[256]; - snprintf(command, sizeof command, "%s %s up &> /dev/null", - ifconfigbin, intf); - return system(command); + struct netdev *netdev; + int retval; + + retval = netdev_open(netdev_name, NETDEV_ETH_TYPE_NONE, &netdev); + if (!retval) { + retval = netdev_turn_flags_on(netdev, NETDEV_UP, true); + netdev_close(netdev); + } + return retval; } static void open_nl_vconn(const char *name, bool subscribe, struct dpif *dpif) @@ -240,100 +287,192 @@ static void do_del_dp(int argc UNUSED, char *argv[]) dpif_close(&dp); } -static void do_add_port(int argc UNUSED, char *argv[]) +static void add_del_ports(int argc UNUSED, char *argv[], + int (*function)(struct dpif *, const char *netdev), + const char *operation, const char *preposition) { struct dpif dp; - if_up(argv[2]); + bool failure = false; + int i; + open_nl_vconn(argv[1], false, &dp); - run(dpif_add_port(&dp, argv[2]), "add_port"); + for (i = 2; i < argc; i++) { + int retval = function(&dp, argv[i]); + if (retval) { + error(retval, "failed to %s %s %s %s", + operation, argv[i], preposition, argv[1]); + failure = true; + } + } dpif_close(&dp); + if (failure) { + exit(EXIT_FAILURE); + } +} + +static int ifup_and_add_port(struct dpif *dpif, const char *netdev) +{ + int retval = if_up(netdev); + return retval ? retval : dpif_add_port(dpif, netdev); +} + +static void do_add_port(int argc UNUSED, char *argv[]) +{ + add_del_ports(argc, argv, ifup_and_add_port, "add", "to"); } static void do_del_port(int argc UNUSED, char *argv[]) { - struct dpif dp; - open_nl_vconn(argv[1], false, &dp); - run(dpif_del_port(&dp, argv[2]), "del_port"); - dpif_close(&dp); + add_del_ports(argc, argv, dpif_del_port, "remove", "from"); } +#endif /* HAVE_NETLINK */ + +/* Generic commands. */ -#define BENCHMARK_INCR 100 +static void +open_vconn(const char *name, struct vconn **vconnp) +{ + run(vconn_open_block(name, OFP_VERSION, vconnp), "connecting to %s", name); +} -static void do_benchmark_nl(int argc UNUSED, char *argv[]) +static void * +alloc_stats_request(size_t body_len, uint16_t type, struct buffer **bufferp) { - struct dpif dp; - uint32_t num_packets, i, milestone; - struct timeval start, end; + 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; +} - 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; +static void +send_openflow_buffer(struct vconn *vconn, struct buffer *buffer) +{ + update_openflow_length(buffer); + run(vconn_send_block(vconn, buffer), "failed to send packet to switch"); +} + +static void +dump_transaction(const char *vconn_name, struct buffer *request) +{ + struct vconn *vconn; + struct buffer *reply; + + 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); + 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 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; + + open_vconn(vconn_name, &vconn); + send_openflow_buffer(vconn, request); + 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) { + struct ofp_stats_reply *osr; + + ofp_print(stdout, reply->data, reply->size, 1); + + 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(b); + buffer_delete(reply); } - 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))); + vconn_close(vconn); +} - dpif_close(&dp); +static void +dump_trivial_stats_transaction(const char *vconn_name, uint8_t stats_type) +{ + struct buffer *request; + alloc_stats_request(0, stats_type, &request); + dump_stats_transaction(vconn_name, request); } -#endif /* HAVE_NETLINK */ - -/* Generic commands. */ -static void do_show(int argc UNUSED, char *argv[]) +static void +do_show(int argc UNUSED, char *argv[]) { -#if 0 - struct dpif dp; - run(dpif_open(atoi(argv[1]), false, &dp), "dpif_open"); - run(dpif_show(&dp), "show"); - dpif_close(&dp); -#endif + dump_trivial_transaction(argv[1], OFPT_FEATURES_REQUEST); + dump_trivial_transaction(argv[1], OFPT_GET_CONFIG_REQUEST); } -static void do_monitor(int argc UNUSED, char *argv[]) +static void +do_status(int argc, char *argv[]) { - struct dpif dp; - run(dpif_open(atoi(argv[1]), true, &dp), "dpif_open"); - for (;;) { - struct buffer *b; - run(dpif_recv_openflow(&dp, &b, true), "dpif_recv_openflow"); + struct nicira_header *request, *reply; + struct vconn *vconn; + struct buffer *b; + + request = make_openflow(sizeof *request, OFPT_VENDOR, &b); + request->vendor_id = htonl(NX_VENDOR_ID); + request->subtype = htonl(NXT_STATUS_REQUEST); + if (argc > 2) { + buffer_put(b, argv[2], strlen(argv[2])); + } + open_vconn(argv[1], &vconn); + run(vconn_transact(vconn, b, &b), "talking to %s", argv[1]); + vconn_close(vconn); + + if (b->size < sizeof *reply) { + fatal(0, "short reply (%zu bytes)", b->size); + } + reply = b->data; + if (reply->header.type != OFPT_VENDOR + || reply->vendor_id != ntohl(NX_VENDOR_ID) + || reply->subtype != ntohl(NXT_STATUS_REPLY)) { ofp_print(stderr, b->data, b->size, 2); - buffer_delete(b); + fatal(0, "bad reply"); } + + fwrite(reply + 1, b->size, 1, stdout); } -static void do_dump_tables(int argc, char *argv[]) +static void +do_dump_desc(int argc, char *argv[]) { - struct dpif dp; - run(dpif_open(atoi(argv[1]), false, &dp), "dpif_open"); - run(dpif_dump_tables(&dp), "dump_tables"); - dpif_close(&dp); + dump_trivial_stats_transaction(argv[1], OFPST_DESC); +} + +static void +do_dump_tables(int argc, char *argv[]) +{ + dump_trivial_stats_transaction(argv[1], OFPST_TABLE); } static uint32_t str_to_int(const char *str) { + char *tail; uint32_t value; - if (sscanf(str, "%"SCNu32, &value) != 1) { + + errno = 0; + value = strtoul(str, &tail, 0); + if (errno == EINVAL || errno == ERANGE || *tail) { fatal(0, "invalid numeric format %s", str); } return value; @@ -348,47 +487,164 @@ str_to_mac(const char *str, uint8_t mac[6]) } } -static void -str_to_ip(const char *str, uint32_t *ip) +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 retval; + int n_wild, retval; - retval = lookup_ip(str, &in_addr); + name = strtok_r(str, "//", &save_ptr); + retval = name ? lookup_ip(name, &in_addr) : EINVAL; if (retval) { 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))) { + fatal(0, "%s: %s is not a valid netmask", str, netmask); + } + } + } else { + int prefix = atoi(netmask); + if (prefix <= 0 || prefix > 32) { + fatal(0, "%s: network prefix bits not between 1 and 32", str); + } + n_wild = 32 - prefix; + } + } else { + n_wild = 0; + } + + free(str); + return n_wild; } 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); + itype = 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) +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) { - struct field { - const char *name; - uint32_t wildcard; - enum { F_U8, F_U16, F_MAC, F_IP } type; - size_t offset; + static const struct protocol protocols[] = { + { "ip", ETH_TYPE_IP }, + { "arp", ETH_TYPE_ARP }, + { "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; + } + } + *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; +}; + +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) }, @@ -396,116 +652,192 @@ str_to_flow(char *string, struct ofp_match *match, struct ofp_action *action) { "dl_src", OFPFW_DL_SRC, F_MAC, F_OFS(dl_src) }, { "dl_dst", OFPFW_DL_DST, F_MAC, F_OFS(dl_dst) }, { "dl_type", OFPFW_DL_TYPE, F_U16, F_OFS(dl_type) }, - { "nw_src", OFPFW_NW_SRC, F_IP, F_OFS(nw_src) }, - { "nw_dst", OFPFW_NW_DST, F_IP, F_OFS(nw_dst) }, + { "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) }, { "tp_src", OFPFW_TP_SRC, F_U16, F_OFS(tp_src) }, { "tp_dst", OFPFW_TP_DST, F_U16, F_OFS(tp_dst) }, }; + const struct field *f; - char *name, *value; - uint32_t wildcards; - bool got_action = false; + for (f = fields; f < &fields[ARRAY_SIZE(fields)]; f++) { + if (!strcmp(f->name, name)) { + *f_out = f; + return true; + } + } + *f_out = NULL; + return false; +} - memset(match, 0, sizeof *match); - wildcards = OFPFW_ALL; - for (name = strtok(string, "="), value = strtok(NULL, " \t\n"); - name && value; - name = strtok(NULL, "="), value = strtok(NULL, " \t\n")) - { - const struct field *f; - void *data; +static void +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) +{ - if (action && !strcmp(name, "action")) { - got_action = true; - str_to_action(value, action); - continue; - } + char *name; + uint32_t wildcards; - for (f = fields; f < &fields[ARRAY_SIZE(fields)]; f++) { - if (!strcmp(f->name, name)) { - goto found; - } + 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) { + char *act_str = strstr(string, "action"); + if (!act_str) { + fatal(0, "must specify an action"); } - fprintf(stderr, "%s: unknown field %s (fields are", - program_name, name); - for (f = fields; f < &fields[ARRAY_SIZE(fields)]; f++) { - if (f != fields) { - putc(',', stderr); - } - fprintf(stderr, " %s", f->name); + *(act_str-1) = '\0'; + + act_str = strchr(act_str, '='); + if (!act_str) { + fatal(0, "must specify an action"); } - fprintf(stderr, ")\n"); - exit(1); - found: - data = (char *) match + f->offset; - if (!strcmp(value, "*")) { - wildcards |= f->wildcard; + act_str++; + + str_to_action(act_str, action, n_actions); + } + memset(match, 0, sizeof *match); + wildcards = OFPFW_ALL; + for (name = strtok(string, "=, \t\r\n"); name; + name = strtok(NULL, "=, \t\r\n")) { + 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 { - wildcards &= ~f->wildcard; - if (f->type == F_U8) { - *(uint8_t *) data = str_to_int(value); - } else if (f->type == F_U16) { - *(uint16_t *) data = htons(str_to_int(value)); - } else if (f->type == F_MAC) { - str_to_mac(value, data); - } else if (f->type == F_IP) { - str_to_ip(value, data); + const struct field *f; + char *value; + + value = strtok(NULL, ", \t\r\n"); + if (!value) { + fatal(0, "field %s missing value", name); + } + + if (table_idx && !strcmp(name, "table")) { + *table_idx = 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->type == F_U8) { + *(uint8_t *) data = str_to_int(value); + } else if (f->type == F_U16) { + *(uint16_t *) data = htons(str_to_int(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 { - NOT_REACHED(); + fatal(0, "unknown keyword %s", name); } } } - if (name && !value) { - fatal(0, "field %s missing value", name); - } - if (action && !got_action) { - fatal(0, "must specify an action"); - } - match->wildcards = htons(wildcards); + match->wildcards = htonl(wildcards); } static void do_dump_flows(int argc, char *argv[]) { - struct dpif dp; - struct ofp_match match, *matchp; - run(dpif_open(atoi(argv[1]), false, &dp), "dpif_open"); - if (argc == 4) { - str_to_flow(argv[3], &match, NULL); - matchp = &match; - } else { - matchp = NULL; - } - run(dpif_dump_flows(&dp, atoi(argv[2]), matchp), "dump_flows"); - dpif_close(&dp); + 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_add_flows(int argc, char *argv[]) +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; - char vconn_name[16]; + struct buffer *buffer; + struct ofp_flow_mod *ofm; + uint16_t priority, idle_timeout, hard_timeout; + size_t size; + int n_actions = MAX_ADD_ACTS; + + /* 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]; + + open_vconn(argv[1], &vconn); + send_openflow_buffer(vconn, buffer); + vconn_close(vconn); +} +static void do_add_flows(int argc, char *argv[]) +{ + struct vconn *vconn; FILE *file; char line[1024]; - int retval; - file = fopen(argv[2], "r"); if (file == NULL) { fatal(errno, "%s: open", argv[2]); } - sprintf(vconn_name, "nl:%d", atoi(argv[1])); - retval = vconn_open(vconn_name, &vconn); - if (retval) { - fatal(retval, "opening datapath"); - } - + open_vconn(argv[1], &vconn); while (fgets(line, sizeof line, file)) { struct buffer *buffer; struct ofp_flow_mod *ofm; + uint16_t priority, idle_timeout, hard_timeout; size_t size; + int n_actions = MAX_ADD_ACTS; char *comment; @@ -520,30 +852,295 @@ static void do_add_flows(int argc, char *argv[]) continue; } - size = sizeof *ofm + sizeof ofm->actions[0]; - buffer = buffer_new(size); - ofm = buffer_put_uninit(buffer, size); - - /* Parse. */ - memset(ofm, 0, size); - ofm->header.type = OFPT_FLOW_MOD; - ofm->header.version = OFP_VERSION; - ofm->header.length = htons(size); + /* Parse and send. */ + 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]); + ofm->priority = htons(priority); + ofm->reserved = htonl(0); - retval = vconn_send_block(vconn, buffer); - if (retval) { - fatal(retval, "sending to datapath"); - } + /* 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); fclose(file); } +static void do_mod_flows(int argc, char *argv[]) +{ + uint16_t idle_timeout, hard_timeout; + struct vconn *vconn; + struct buffer *buffer; + struct ofp_flow_mod *ofm; + size_t size; + int n_actions = MAX_ADD_ACTS; + + /* 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, NULL, &idle_timeout, &hard_timeout); + 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(0); + ofm->reserved = htonl(0); + + /* xxx Should we use the buffer library? */ + buffer->size -= (MAX_ADD_ACTS - n_actions) * sizeof ofm->actions[0]; + + open_vconn(argv[1], &vconn); + send_openflow_buffer(vconn, buffer); + vconn_close(vconn); +} + +static void do_del_flows(int argc, char *argv[]) +{ + struct vconn *vconn; + uint16_t priority; + struct buffer *buffer; + struct ofp_flow_mod *ofm; + size_t size; + + /* Parse and send. */ + size = sizeof *ofm; + 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->idle_timeout = htons(0); + ofm->hard_timeout = htons(0); + ofm->buffer_id = htonl(UINT32_MAX); + 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(int argc UNUSED, char *argv[]) +{ + struct vconn *vconn; + const char *name; + + /* If the user specified, e.g., "nl:0", append ":1" to it to ensure that + * the connection will subscribe to listen for asynchronous messages, such + * as packet-in messages. */ + if (!strncmp(argv[1], "nl:", 3) && strrchr(argv[1], ':') == &argv[1][2]) { + name = xasprintf("%s:1", argv[1]); + } else { + name = argv[1]; + } + open_vconn(argv[1], &vconn); + for (;;) { + struct buffer *b; + run(vconn_recv_block(vconn, &b), "vconn_recv"); + ofp_print(stderr, b->data, b->size, 2); + buffer_delete(b); + } +} + +static void +do_dump_ports(int argc, char *argv[]) +{ + 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); + open_vconn(argv[1], &vconn); + 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_mod_port(int argc, char *argv[]) +{ + struct buffer *request, *reply; + struct ofp_switch_features *osf; + struct ofp_port_mod *opm; + 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) { + fatal(0, "couldn't find monitored port: %s", argv[2]); + } + + opm = make_openflow(sizeof(struct ofp_port_mod), OFPT_PORT_MOD, &request); + memcpy(&opm->desc, &osf->ports[port_idx], sizeof osf->ports[0]); + opm->mask = 0; + opm->desc.flags = 0; + + printf("modifying port: %s\n", osf->ports[port_idx].name); + + if (!strncasecmp(argv[3], MOD_PORT_CMD_UP, sizeof MOD_PORT_CMD_UP)) { + opm->mask |= htonl(OFPPFL_PORT_DOWN); + } else if (!strncasecmp(argv[3], MOD_PORT_CMD_DOWN, + sizeof MOD_PORT_CMD_DOWN)) { + opm->mask |= htonl(OFPPFL_PORT_DOWN); + opm->desc.flags |= htonl(OFPPFL_PORT_DOWN); + } else if (!strncasecmp(argv[3], MOD_PORT_CMD_FLOOD, + sizeof MOD_PORT_CMD_FLOOD)) { + opm->mask |= htonl(OFPPFL_NO_FLOOD); + } else if (!strncasecmp(argv[3], MOD_PORT_CMD_NOFLOOD, + sizeof MOD_PORT_CMD_NOFLOOD)) { + opm->mask |= htonl(OFPPFL_NO_FLOOD); + opm->desc.flags |= htonl(OFPPFL_NO_FLOOD); + } else { + fatal(0, "unknown mod-port command '%s'", argv[3]); + } + + send_openflow_buffer(vconn, 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); + } + + open_vconn(argv[1], &vconn); + 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); + + open_vconn(argv[1], &vconn); + 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) { usage(); @@ -553,16 +1150,27 @@ static struct command all_commands[] = { #ifdef HAVE_NETLINK { "adddp", 1, 1, do_add_dp }, { "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 }, + { "addif", 2, INT_MAX, do_add_port }, + { "delif", 2, INT_MAX, do_del_port }, #endif { "show", 1, 1, do_show }, + { "status", 1, 2, do_status }, { "help", 0, INT_MAX, do_help }, { "monitor", 1, 1, do_monitor }, + { "dump-desc", 1, 1, do_dump_desc }, { "dump-tables", 1, 1, do_dump_tables }, - { "dump-flows", 2, 3, do_dump_flows }, + { "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 }, + { "mod-flows", 2, 2, do_mod_flows }, + { "del-flows", 1, 2, do_del_flows }, + { "dump-ports", 1, 1, 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 }, + { NULL, 0, 0, NULL }, };