X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fdpctl.c;h=923e04874f186ad522403981c35231455676b219;hb=refs%2Fheads%2Ffor-nox%2F0.4;hp=62c93c676430ab523796ee38f297fca809420a9d;hpb=7d7d973d8b37a791d0c153dbcf55a559418bab6b;p=sliver-openvswitch.git diff --git a/utilities/dpctl.c b/utilities/dpctl.c index 62c93c676..923e04874 100644 --- a/utilities/dpctl.c +++ b/utilities/dpctl.c @@ -47,15 +47,16 @@ #ifdef HAVE_NETLINK #include "netdev.h" #include "netlink.h" -#include "openflow-netlink.h" +#include "openflow/openflow-netlink.h" #endif -#include "buffer.h" #include "command-line.h" #include "compiler.h" #include "dpif.h" +#include "openflow/nicira-ext.h" #include "ofp-print.h" -#include "openflow.h" +#include "ofpbuf.h" +#include "openflow/openflow.h" #include "packets.h" #include "random.h" #include "socket-util.h" @@ -68,66 +69,79 @@ #define THIS_MODULE VLM_dpctl #define DEFAULT_IDLE_TIMEOUT 60 -#define MAX_ADD_ACTS 5 + +/* Maximum size of action buffer for adding and modify flows */ +#define MAX_ACT_LEN 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" + +/* Settings that may be configured by the user. */ +struct settings { + bool strict; /* Use strict matching for flow mod commands */ +}; + struct command { const char *name; int min_args; int max_args; - void (*handler)(int argc, char *argv[]); + void (*handler)(const struct settings *, int argc, char *argv[]); }; static struct command all_commands[]; static void usage(void) NO_RETURN; -static void parse_options(int argc, char *argv[]); +static void parse_options(int argc, char *argv[], struct settings *); int main(int argc, char *argv[]) { + struct settings s; struct command *p; set_program_name(argv[0]); time_init(); vlog_init(); - parse_options(argc, argv); + parse_options(argc, argv, &s); signal(SIGPIPE, SIG_IGN); argc -= optind; argv += optind; if (argc < 1) - fatal(0, "missing command name; use --help for help"); + ofp_fatal(0, "missing command name; use --help for help"); for (p = all_commands; p->name != NULL; p++) { if (!strcmp(p->name, argv[0])) { int n_arg = argc - 1; if (n_arg < p->min_args) - fatal(0, "'%s' command requires at least %d arguments", - p->name, p->min_args); + ofp_fatal(0, "'%s' command requires at least %d arguments", + p->name, p->min_args); else if (n_arg > p->max_args) - fatal(0, "'%s' command takes at most %d arguments", - p->name, p->max_args); + ofp_fatal(0, "'%s' command takes at most %d arguments", + p->name, p->max_args); else { - p->handler(argc, argv); + p->handler(&s, argc, argv); exit(0); } } } - fatal(0, "unknown command '%s'; use --help for help", argv[0]); + ofp_fatal(0, "unknown command '%s'; use --help for help", argv[0]); return 0; } static void -parse_options(int argc, char *argv[]) +parse_options(int argc, char *argv[], struct settings *s) { + enum { + OPT_STRICT = UCHAR_MAX + 1 + }; static struct option long_options[] = { {"timeout", required_argument, 0, 't'}, {"verbose", optional_argument, 0, 'v'}, + {"strict", no_argument, 0, OPT_STRICT}, {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'V'}, VCONN_SSL_LONG_OPTIONS @@ -135,6 +149,9 @@ parse_options(int argc, char *argv[]) }; char *short_options = long_options_to_short_options(long_options); + /* Set defaults that we can figure out before parsing options. */ + s->strict = false; + for (;;) { unsigned long int timeout; int c; @@ -148,8 +165,8 @@ parse_options(int argc, char *argv[]) case 't': timeout = strtoul(optarg, NULL, 10); if (timeout <= 0) { - fatal(0, "value %s on -t or --timeout is not at least 1", - optarg); + ofp_fatal(0, "value %s on -t or --timeout is not at least 1", + optarg); } else { time_alarm(timeout); } @@ -159,13 +176,18 @@ parse_options(int argc, char *argv[]) usage(); case 'V': - printf("%s "VERSION" compiled "__DATE__" "__TIME__"\n", argv[0]); + printf("%s %s compiled "__DATE__" "__TIME__"\n", + program_name, VERSION BUILDNR); exit(EXIT_SUCCESS); case 'v': vlog_set_verbosity(optarg); break; + case OPT_STRICT: + s->strict = true; + break; + VCONN_SSL_OPTION_HANDLERS case '?': @@ -189,7 +211,6 @@ usage(void) " deldp nl:DP_ID delete local datapath DP_ID\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" - " monitor nl:DP_ID print packets received\n" #endif "\nFor local datapaths and remote switches:\n" " show SWITCH show basic information\n" @@ -202,20 +223,27 @@ usage(void) " 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" +#ifdef SUPPORT_SNAT + " add-snat SWITCH IFACE IP add SNAT config to IFACE\n" + " del-snat SWITCH IFACE delete SNAT config on IFACE\n" +#endif " 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" + " 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" + " execute SWITCH CMD [ARG...] execute CMD with ARGS on 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" + vconn_usage(true, false, false); + vlog_usage(); + printf("\nOther options:\n" + " --strict use strict match for flow commands\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); @@ -264,12 +292,12 @@ static void open_nl_vconn(const char *name, bool subscribe, struct dpif *dpif) if (strncmp(name, "nl:", 3) || strlen(name) < 4 || name[strspn(name + 3, "0123456789") + 3]) { - fatal(0, "%s: argument is not of the form \"nl:DP_ID\"", name); + ofp_fatal(0, "%s: argument is not of the form \"nl:DP_ID\"", name); } run(dpif_open(atoi(name + 3), subscribe, dpif), "opening datapath"); } -static void do_add_dp(int argc UNUSED, char *argv[]) +static void do_add_dp(const struct settings *s, int argc UNUSED, char *argv[]) { struct dpif dp; open_nl_vconn(argv[1], false, &dp); @@ -277,7 +305,7 @@ static void do_add_dp(int argc UNUSED, char *argv[]) dpif_close(&dp); } -static void do_del_dp(int argc UNUSED, char *argv[]) +static void do_del_dp(const struct settings *s, int argc UNUSED, char *argv[]) { struct dpif dp; open_nl_vconn(argv[1], false, &dp); @@ -297,8 +325,8 @@ static void add_del_ports(int argc UNUSED, char *argv[], 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]); + ofp_error(retval, "failed to %s %s %s %s", + operation, argv[i], preposition, argv[1]); failure = true; } } @@ -314,33 +342,29 @@ static int ifup_and_add_port(struct dpif *dpif, const char *netdev) return retval ? retval : dpif_add_port(dpif, netdev); } -static void do_add_port(int argc UNUSED, char *argv[]) +static void do_add_port(const struct settings *s, 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[]) +static void do_del_port(const struct settings *s, int argc UNUSED, + char *argv[]) { add_del_ports(argc, argv, dpif_del_port, "remove", "from"); } - -static void do_monitor(int argc UNUSED, char *argv[]) -{ - struct dpif dp; - open_nl_vconn(argv[1], true, &dp); - for (;;) { - struct buffer *b; - run(dpif_recv_openflow(&dp, &b, true), "dpif_recv_openflow"); - ofp_print(stderr, b->data, b->size, 2); - buffer_delete(b); - } -} #endif /* HAVE_NETLINK */ /* Generic commands. */ +static void +open_vconn(const char *name, struct vconn **vconnp) +{ + run(vconn_open_block(name, OFP_VERSION, vconnp), "connecting to %s", name); +} + static void * -alloc_stats_request(size_t body_len, uint16_t type, struct buffer **bufferp) +alloc_stats_request(size_t body_len, uint16_t type, struct ofpbuf **bufferp) { struct ofp_stats_request *rq; rq = make_openflow((offsetof(struct ofp_stats_request, body) @@ -351,20 +375,20 @@ alloc_stats_request(size_t body_len, uint16_t type, struct buffer **bufferp) } static void -send_openflow_buffer(struct vconn *vconn, struct buffer *buffer) +send_openflow_buffer(struct vconn *vconn, struct ofpbuf *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) +dump_transaction(const char *vconn_name, struct ofpbuf *request) { struct vconn *vconn; - struct buffer *reply; + struct ofpbuf *reply; update_openflow_length(request); - run(vconn_open_block(vconn_name, &vconn), "connecting to %s", vconn_name); + 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); @@ -373,23 +397,23 @@ dump_transaction(const char *vconn_name, struct buffer *request) static void dump_trivial_transaction(const char *vconn_name, uint8_t request_type) { - struct buffer *request; + struct ofpbuf *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) +dump_stats_transaction(const char *vconn_name, struct ofpbuf *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); + open_vconn(vconn_name, &vconn); send_openflow_buffer(vconn, request); while (!done) { uint32_t recv_xid; - struct buffer *reply; + struct ofpbuf *reply; run(vconn_recv_block(vconn, &reply), "OpenFlow packet receive failed"); recv_xid = ((struct ofp_header *) reply->data)->xid; @@ -398,13 +422,13 @@ dump_stats_transaction(const char *vconn_name, struct buffer *request) ofp_print(stdout, reply->data, reply->size, 1); - osr = buffer_at(reply, 0, sizeof *osr); + osr = ofpbuf_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); + ofpbuf_delete(reply); } vconn_close(vconn); } @@ -412,37 +436,57 @@ dump_stats_transaction(const char *vconn_name, struct buffer *request) static void dump_trivial_stats_transaction(const char *vconn_name, uint8_t stats_type) { - struct buffer *request; + struct ofpbuf *request; alloc_stats_request(0, stats_type, &request); dump_stats_transaction(vconn_name, request); } static void -do_show(int argc UNUSED, char *argv[]) +do_show(const struct settings *s, int argc UNUSED, char *argv[]) { dump_trivial_transaction(argv[1], OFPT_FEATURES_REQUEST); dump_trivial_transaction(argv[1], OFPT_GET_CONFIG_REQUEST); } static void -do_status(int argc, char *argv[]) +do_status(const struct settings *s, int argc, char *argv[]) { - struct buffer *request; - alloc_stats_request(0, OFPST_SWITCH, &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) { - buffer_put(request, argv[2], strlen(argv[2])); + ofpbuf_put(b, argv[2], strlen(argv[2])); } - dump_stats_transaction(argv[1], request); + open_vconn(argv[1], &vconn); + run(vconn_transact(vconn, b, &b), "talking to %s", argv[1]); + vconn_close(vconn); + + if (b->size < sizeof *reply) { + ofp_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); + ofp_fatal(0, "bad reply"); + } + + fwrite(reply + 1, b->size, 1, stdout); } static void -do_dump_desc(int argc, char *argv[]) +do_dump_desc(const struct settings *s, int argc, char *argv[]) { dump_trivial_stats_transaction(argv[1], OFPST_DESC); } static void -do_dump_tables(int argc, char *argv[]) +do_dump_tables(const struct settings *s, int argc, char *argv[]) { dump_trivial_stats_transaction(argv[1], OFPST_TABLE); } @@ -457,7 +501,7 @@ str_to_int(const char *str) errno = 0; value = strtoul(str, &tail, 0); if (errno == EINVAL || errno == ERANGE || *tail) { - fatal(0, "invalid numeric format %s", str); + ofp_fatal(0, "invalid numeric format %s", str); } return value; } @@ -467,7 +511,7 @@ str_to_mac(const char *str, uint8_t mac[6]) { if (sscanf(str, "%"SCNx8":%"SCNx8":%"SCNx8":%"SCNx8":%"SCNx8":%"SCNx8, &mac[0], &mac[1], &mac[2], &mac[3], &mac[4], &mac[5]) != 6) { - fatal(0, "invalid mac address %s", str); + ofp_fatal(0, "invalid mac address %s", str); } } @@ -483,7 +527,7 @@ str_to_ip(const char *str_, uint32_t *ip) 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); + ofp_fatal(0, "%s: could not convert to IP address", str); } *ip = in_addr.s_addr; @@ -506,13 +550,15 @@ str_to_ip(const char *str_, uint32_t *ip) /* 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); + ofp_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); + ofp_fatal(0, "%s: network prefix bits not between 1 and 32", + str); } n_wild = 32 - prefix; } @@ -525,19 +571,22 @@ str_to_ip(const char *str_, uint32_t *ip) } static void -str_to_action(char *str, struct ofp_action *action, int *n_actions) +str_to_action(char *str, struct ofp_action_header *actions, + size_t *actions_len) { - uint16_t port; - int i; - int max_actions = *n_actions; + size_t len = *actions_len; char *act, *arg; char *saveptr = NULL; + uint8_t *p = (uint8_t *)actions; - memset(action, 0, sizeof(*action) * max_actions); - for (i=0, act = strtok_r(str, ", \t\r\n", &saveptr); - i= sizeof(struct ofp_action_header)) && act; + act = strtok_r(NULL, ", \t\r\n", &saveptr)) { + uint16_t port; + struct ofp_action_header *ah = (struct ofp_action_header *)p; + int act_len = sizeof *ah; port = OFPP_MAX; /* Arguments are separated by colons */ @@ -547,16 +596,48 @@ str_to_action(char *str, struct ofp_action *action, int *n_actions) arg++; } - if (!strcasecmp(act, "mod_vlan")) { - action[i].type = htons(OFPAT_SET_DL_VLAN); + if (!strcasecmp(act, "mod_vlan_vid")) { + struct ofp_action_vlan_vid *va = (struct ofp_action_vlan_vid *)ah; - if (!strcasecmp(arg, "strip")) { - action[i].arg.vlan_id = htons(OFP_VLAN_NONE); - } else { - action[i].arg.vlan_id = htons(str_to_int(arg)); + if (len < sizeof *va) { + ofp_fatal(0, "Insufficient room for vlan vid action\n"); } + + act_len = sizeof *va; + va->type = htons(OFPAT_SET_VLAN_VID); + va->vlan_vid = htons(str_to_int(arg)); + } else if (!strcasecmp(act, "mod_vlan_pcp")) { + struct ofp_action_vlan_pcp *va = (struct ofp_action_vlan_pcp *)ah; + + if (len < sizeof *va) { + ofp_fatal(0, "Insufficient room for vlan pcp action\n"); + } + + act_len = sizeof *va; + va->type = htons(OFPAT_SET_VLAN_PCP); + va->vlan_pcp = str_to_int(arg); + } else if (!strcasecmp(act, "strip_vlan")) { + ah->type = htons(OFPAT_STRIP_VLAN); } else if (!strcasecmp(act, "output")) { port = str_to_int(arg); +#ifdef SUPPORT_SNAT + } else if (!strcasecmp(act, "nat")) { + struct nx_action_snat *sa = (struct nx_action_snat *)ah; + + if (len < sizeof *sa) { + ofp_fatal(0, "Insufficient room for SNAT action\n"); + } + + if (str_to_int(arg) > OFPP_MAX) { + ofp_fatal(0, "Invalid nat port: %s\n", arg); + } + + act_len = sizeof *sa; + sa->type = htons(OFPAT_VENDOR); + sa->vendor = htonl(NX_VENDOR_ID); + sa->subtype = htons(NXAST_SNAT); + sa->port = htons(str_to_int(arg)); +#endif } else if (!strcasecmp(act, "TABLE")) { port = OFPP_TABLE; } else if (!strcasecmp(act, "NORMAL")) { @@ -566,29 +647,47 @@ str_to_action(char *str, struct ofp_action *action, int *n_actions) } 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)); - } + struct ofp_action_output *ca = (struct ofp_action_output *)ah; + + if (act_len < sizeof *ca) { + ofp_fatal(0, "Insufficient room for controller action\n"); + } + + act_len = sizeof *ca; + ca->type = htons(OFPAT_OUTPUT); + ca->port = htons(OFPP_CONTROLLER); + + /* Unless a numeric argument is specified, we send the whole + * packet to the controller. */ + if (arg && (strspn(act, "0123456789") == strlen(act))) { + ca->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); + ofp_fatal(0, "Unknown action: %s", act); } if (port != OFPP_MAX) { - action[i].type = htons(OFPAT_OUTPUT); - action[i].arg.output.port = htons(port); + struct ofp_action_output *oa = (struct ofp_action_output *)p; + + if (act_len < sizeof *oa) { + ofp_fatal(0, "Insufficient room for output action\n"); + } + + act_len = sizeof *oa; + oa->type = htons(OFPAT_OUTPUT); + oa->port = htons(port); } + + ah->len = htons(act_len); + p += act_len; + len -= act_len; } - *n_actions = i; + *actions_len -= len; } struct protocol { @@ -643,6 +742,8 @@ parse_field(const char *name, const struct field **f_out) { "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) }, + { "icmp_type", OFPFW_ICMP_TYPE, F_U16, F_OFS(icmp_type) }, + { "icmp_code", OFPFW_ICMP_CODE, F_U16, F_OFS(icmp_code) } }; const struct field *f; @@ -658,8 +759,9 @@ parse_field(const char *name, const struct field **f_out) 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) + struct ofp_action_header *actions, size_t *actions_len, + uint8_t *table_idx, uint16_t *out_port, uint16_t *priority, + uint16_t *idle_timeout, uint16_t *hard_timeout) { char *name; @@ -668,6 +770,9 @@ str_to_flow(char *string, struct ofp_match *match, if (table_idx) { *table_idx = 0xff; } + if (out_port) { + *out_port = OFPP_NONE; + } if (priority) { *priority = OFP_DEFAULT_PRIORITY; } @@ -677,21 +782,21 @@ str_to_flow(char *string, struct ofp_match *match, if (hard_timeout) { *hard_timeout = OFP_FLOW_PERMANENT; } - if (action) { + if (actions) { char *act_str = strstr(string, "action"); if (!act_str) { - fatal(0, "must specify an action"); + ofp_fatal(0, "must specify an action"); } *(act_str-1) = '\0'; act_str = strchr(act_str, '='); if (!act_str) { - fatal(0, "must specify an action"); + ofp_fatal(0, "must specify an action"); } act_str++; - str_to_action(act_str, action, n_actions); + str_to_action(act_str, actions, actions_len); } memset(match, 0, sizeof *match); wildcards = OFPFW_ALL; @@ -712,11 +817,13 @@ str_to_flow(char *string, struct ofp_match *match, value = strtok(NULL, ", \t\r\n"); if (!value) { - fatal(0, "field %s missing value", name); + ofp_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")) { @@ -742,55 +849,110 @@ str_to_flow(char *string, struct ofp_match *match, } } } else { - fatal(0, "unknown keyword %s", name); + ofp_fatal(0, "unknown keyword %s", name); } } } match->wildcards = htonl(wildcards); } -static void do_dump_flows(int argc, char *argv[]) +static void do_dump_flows(const struct settings *s, int argc, char *argv[]) { struct ofp_flow_stats_request *req; - struct buffer *request; + 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, 0, - &req->table_id, NULL, NULL, NULL); - memset(req->pad, 0, sizeof req->pad); + &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); } -static void do_dump_aggregate(int argc, char *argv[]) +static void do_dump_aggregate(const struct settings *s, int argc, + char *argv[]) { struct ofp_aggregate_stats_request *req; - struct buffer *request; + 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, 0, - &req->table_id, NULL, NULL, NULL); - memset(req->pad, 0, sizeof req->pad); + &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); } -static void do_add_flow(int argc, char *argv[]) +#ifdef SUPPORT_SNAT +static void do_add_snat(const struct settings *s, int argc, char *argv[]) { struct vconn *vconn; - struct buffer *buffer; + struct ofpbuf *buffer; + struct nx_act_config *nac; + size_t size; + + /* Parse and send. */ + size = sizeof *nac + sizeof nac->snat[0]; + nac = make_openflow(size, OFPT_VENDOR, &buffer); + + nac->header.vendor = htonl(NX_VENDOR_ID); + nac->header.subtype = htonl(NXT_ACT_SET_CONFIG); + + nac->type = htons(NXAST_SNAT); + nac->snat[0].command = NXSC_ADD; + nac->snat[0].port = htons(str_to_int(argv[2])); + nac->snat[0].mac_timeout = htons(0); + str_to_ip(argv[3], &nac->snat[0].ip_addr_start); + str_to_ip(argv[3], &nac->snat[0].ip_addr_end); + + open_vconn(argv[1], &vconn); + send_openflow_buffer(vconn, buffer); + vconn_close(vconn); +} + +static void do_del_snat(const struct settings *s, int argc, char *argv[]) +{ + struct vconn *vconn; + struct ofpbuf *buffer; + struct nx_act_config *nac; + size_t size; + + /* Parse and send. */ + size = sizeof *nac + sizeof nac->snat[0]; + nac = make_openflow(size, OFPT_VENDOR, &buffer); + + nac->header.vendor = htonl(NX_VENDOR_ID); + nac->header.subtype = htonl(NXT_ACT_SET_CONFIG); + + nac->type = htons(NXAST_SNAT); + nac->snat[0].command = NXSC_DELETE; + nac->snat[0].port = htons(str_to_int(argv[2])); + nac->snat[0].mac_timeout = htons(0); + + open_vconn(argv[1], &vconn); + send_openflow_buffer(vconn, buffer); + vconn_close(vconn); +} +#endif /* SUPPORT_SNAT */ + +static void do_add_flow(const struct settings *s, int argc, char *argv[]) +{ + struct vconn *vconn; + struct ofpbuf *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]); + size_t actions_len = MAX_ACT_LEN; /* Parse and send. */ - size = sizeof *ofm + (sizeof ofm->actions[0] * MAX_ADD_ACTS); + size = sizeof *ofm + actions_len; 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); + str_to_flow(argv[2], &ofm->match, &ofm->actions[0], &actions_len, + NULL, NULL, &priority, &idle_timeout, &hard_timeout); ofm->command = htons(OFPFC_ADD); ofm->idle_timeout = htons(idle_timeout); ofm->hard_timeout = htons(hard_timeout); @@ -798,32 +960,32 @@ static void do_add_flow(int argc, char *argv[]) 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]; + /* xxx Should we use the ofpbuf library? */ + buffer->size -= MAX_ACT_LEN - actions_len; + open_vconn(argv[1], &vconn); send_openflow_buffer(vconn, buffer); vconn_close(vconn); } -static void do_add_flows(int argc, char *argv[]) +static void do_add_flows(const struct settings *s, int argc, char *argv[]) { struct vconn *vconn; - FILE *file; char line[1024]; file = fopen(argv[2], "r"); if (file == NULL) { - fatal(errno, "%s: open", argv[2]); + ofp_fatal(errno, "%s: open", argv[2]); } - run(vconn_open_block(argv[1], &vconn), "connecting to %s", argv[1]); + open_vconn(argv[1], &vconn); while (fgets(line, sizeof line, file)) { - struct buffer *buffer; + struct ofpbuf *buffer; struct ofp_flow_mod *ofm; uint16_t priority, idle_timeout, hard_timeout; size_t size; - int n_actions = MAX_ADD_ACTS; + size_t actions_len = MAX_ACT_LEN; char *comment; @@ -839,10 +1001,10 @@ static void do_add_flows(int argc, char *argv[]) } /* Parse and send. */ - size = sizeof *ofm + (sizeof ofm->actions[0] * MAX_ADD_ACTS); + size = sizeof *ofm + actions_len; 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); + str_to_flow(line, &ofm->match, &ofm->actions[0], &actions_len, + NULL, NULL, &priority, &idle_timeout, &hard_timeout); ofm->command = htons(OFPFC_ADD); ofm->idle_timeout = htons(idle_timeout); ofm->hard_timeout = htons(hard_timeout); @@ -850,8 +1012,8 @@ static void do_add_flows(int argc, char *argv[]) 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]; + /* xxx Should we use the ofpbuf library? */ + buffer->size -= MAX_ACT_LEN - actions_len; send_openflow_buffer(vconn, buffer); } @@ -859,61 +1021,120 @@ static void do_add_flows(int argc, char *argv[]) fclose(file); } -static void do_del_flows(int argc, char *argv[]) +static void do_mod_flows(const struct settings *s, int argc, char *argv[]) { + uint16_t priority, idle_timeout, hard_timeout; struct vconn *vconn; - uint16_t priority; - - run(vconn_open_block(argv[1], &vconn), "connecting to %s", argv[1]); - struct buffer *buffer; + struct ofpbuf *buffer; struct ofp_flow_mod *ofm; size_t size; + size_t actions_len = MAX_ACT_LEN; + /* Parse and send. */ + size = sizeof *ofm + actions_len; + ofm = make_openflow(size, OFPT_FLOW_MOD, &buffer); + str_to_flow(argv[2], &ofm->match, &ofm->actions[0], &actions_len, + NULL, NULL, &priority, &idle_timeout, &hard_timeout); + if (s->strict) { + ofm->command = htons(OFPFC_MODIFY_STRICT); + } else { + ofm->command = htons(OFPFC_MODIFY); + } + ofm->idle_timeout = htons(idle_timeout); + ofm->hard_timeout = htons(hard_timeout); + ofm->buffer_id = htonl(UINT32_MAX); + ofm->priority = htons(priority); + ofm->reserved = htonl(0); + + /* xxx Should we use the buffer library? */ + buffer->size -= MAX_ACT_LEN - actions_len; + + open_vconn(argv[1], &vconn); + send_openflow_buffer(vconn, buffer); + vconn_close(vconn); +} + +static void do_del_flows(const struct settings *s, int argc, char *argv[]) +{ + struct vconn *vconn; + uint16_t priority; + uint16_t out_port; + struct ofpbuf *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); + &out_port, &priority, NULL, NULL); + if (s->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); + open_vconn(argv[1], &vconn); send_openflow_buffer(vconn, buffer); - vconn_close(vconn); } static void -do_dump_ports(int argc, char *argv[]) +do_monitor(const struct settings *s, 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 ofpbuf *b; + run(vconn_recv_block(vconn, &b), "vconn_recv"); + ofp_print(stderr, b->data, b->size, 2); + ofpbuf_delete(b); + } +} + +static void +do_dump_ports(const struct settings *s, int argc, char *argv[]) { dump_trivial_stats_transaction(argv[1], OFPST_PORT); } static void -do_probe(int argc, char *argv[]) +do_probe(const struct settings *s, int argc, char *argv[]) { - struct buffer *request; + struct ofpbuf *request; struct vconn *vconn; - struct buffer *reply; + struct ofpbuf *reply; make_openflow(sizeof(struct ofp_header), OFPT_ECHO_REQUEST, &request); - run(vconn_open_block(argv[1], &vconn), "connecting to %s", argv[1]); + 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"); + if (reply->size != sizeof(struct ofp_header)) { + ofp_fatal(0, "reply does not match request"); } - buffer_delete(reply); + ofpbuf_delete(reply); vconn_close(vconn); } static void -do_mod_port(int argc, char *argv[]) +do_mod_port(const struct settings *s, int argc, char *argv[]) { - struct buffer *request, *reply; + struct ofpbuf *request, *reply; struct ofp_switch_features *osf; struct ofp_port_mod *opm; struct vconn *vconn; @@ -933,7 +1154,7 @@ do_mod_port(int argc, char *argv[]) /* 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); - run(vconn_open_block(argv[1], &vconn), "connecting to %s", argv[1]); + open_vconn(argv[1], &vconn); run(vconn_transact(vconn, request, &reply), "talking to %s", argv[1]); osf = reply->data; @@ -955,41 +1176,43 @@ do_mod_port(int argc, char *argv[]) } } if (port_idx == n_ports) { - fatal(0, "couldn't find monitored port: %s", argv[2]); + ofp_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; + opm->port_no = osf->ports[port_idx].port_no; + memcpy(opm->hw_addr, osf->ports[port_idx].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)) { - opm->mask |= htonl(OFPPFL_PORT_DOWN); + opm->mask |= htonl(OFPPC_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); + 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)) { - opm->mask |= htonl(OFPPFL_NO_FLOOD); + opm->mask |= htonl(OFPPC_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); + opm->mask |= htonl(OFPPC_NO_FLOOD); + opm->config |= htonl(OFPPC_NO_FLOOD); } else { - fatal(0, "unknown mod-port command '%s'", argv[3]); + ofp_fatal(0, "unknown mod-port command '%s'", argv[3]); } send_openflow_buffer(vconn, request); - buffer_delete(reply); + ofpbuf_delete(reply); vconn_close(vconn); } static void -do_ping(int argc, char *argv[]) +do_ping(const struct settings *s, int argc, char *argv[]) { size_t max_payload = 65535 - sizeof(struct ofp_header); unsigned int payload; @@ -998,13 +1221,13 @@ do_ping(int argc, char *argv[]) payload = argc > 2 ? atoi(argv[2]) : 64; if (payload > max_payload) { - fatal(0, "payload must be between 0 and %zu bytes", max_payload); + ofp_fatal(0, "payload must be between 0 and %zu bytes", max_payload); } - run(vconn_open_block(argv[1], &vconn), "connecting to %s", argv[1]); + open_vconn(argv[1], &vconn); for (i = 0; i < 10; i++) { struct timeval start, end; - struct buffer *request, *reply; + struct ofpbuf *request, *reply; struct ofp_header *rq_hdr, *rpy_hdr; rq_hdr = make_openflow(sizeof(struct ofp_header) + payload, @@ -1012,7 +1235,7 @@ do_ping(int argc, char *argv[]) random_bytes(rq_hdr + 1, payload); gettimeofday(&start, NULL); - run(vconn_transact(vconn, buffer_clone(request), &reply), "transact"); + run(vconn_transact(vconn, ofpbuf_clone(request), &reply), "transact"); gettimeofday(&end, NULL); rpy_hdr = reply->data; @@ -1029,14 +1252,14 @@ do_ping(int argc, char *argv[]) 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); + ofpbuf_delete(request); + ofpbuf_delete(reply); } vconn_close(vconn); } static void -do_benchmark(int argc, char *argv[]) +do_benchmark(const struct settings *s, int argc, char *argv[]) { size_t max_payload = 65535 - sizeof(struct ofp_header); struct timeval start, end; @@ -1048,7 +1271,7 @@ do_benchmark(int argc, char *argv[]) payload_size = atoi(argv[2]); if (payload_size > max_payload) { - fatal(0, "payload must be between 0 and %zu bytes", max_payload); + ofp_fatal(0, "payload must be between 0 and %zu bytes", max_payload); } message_size = sizeof(struct ofp_header) + payload_size; @@ -1057,16 +1280,16 @@ do_benchmark(int argc, char *argv[]) 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]); + open_vconn(argv[1], &vconn); gettimeofday(&start, NULL); for (i = 0; i < count; i++) { - struct buffer *request, *reply; + struct ofpbuf *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); + ofpbuf_delete(reply); } gettimeofday(&end, NULL); vconn_close(vconn); @@ -1078,7 +1301,73 @@ do_benchmark(int argc, char *argv[]) count * message_size / (duration / 1000.0)); } -static void do_help(int argc UNUSED, char *argv[] UNUSED) +static void +do_execute(const struct settings *s, int argc, char *argv[]) +{ + struct vconn *vconn; + struct ofpbuf *request; + struct nicira_header *nicira; + struct nx_command_reply *ncr; + uint32_t xid; + int i; + + nicira = make_openflow(sizeof *nicira, OFPT_VENDOR, &request); + xid = nicira->header.xid; + nicira->vendor = htonl(NX_VENDOR_ID); + nicira->subtype = htonl(NXT_COMMAND_REQUEST); + ofpbuf_put(request, argv[2], strlen(argv[2])); + for (i = 3; i < argc; i++) { + ofpbuf_put_zeros(request, 1); + ofpbuf_put(request, argv[i], strlen(argv[i])); + } + update_openflow_length(request); + + open_vconn(argv[1], &vconn); + run(vconn_send_block(vconn, request), "send"); + + for (;;) { + struct ofpbuf *reply; + uint32_t status; + + run(vconn_recv_xid(vconn, xid, &reply), "recv_xid"); + if (reply->size < sizeof *ncr) { + ofp_fatal(0, "reply is too short (%zu bytes < %zu bytes)", + reply->size, sizeof *ncr); + } + ncr = reply->data; + if (ncr->nxh.header.type != OFPT_VENDOR + || ncr->nxh.vendor != htonl(NX_VENDOR_ID) + || ncr->nxh.subtype != htonl(NXT_COMMAND_REPLY)) { + ofp_fatal(0, "reply is invalid"); + } + + status = ntohl(ncr->status); + if (status & NXT_STATUS_STARTED) { + /* Wait for a second reply. */ + continue; + } else if (status & NXT_STATUS_EXITED) { + fprintf(stderr, "process terminated normally with exit code %d", + status & NXT_STATUS_EXITSTATUS); + } else if (status & NXT_STATUS_SIGNALED) { + fprintf(stderr, "process terminated by signal %d", + status & NXT_STATUS_TERMSIG); + } else if (status & NXT_STATUS_ERROR) { + fprintf(stderr, "error executing command"); + } else { + fprintf(stderr, "process terminated for unknown reason"); + } + if (status & NXT_STATUS_COREDUMP) { + fprintf(stderr, " (core dumped)"); + } + putc('\n', stderr); + + fwrite(ncr + 1, reply->size - sizeof *ncr, 1, stdout); + break; + } +} + +static void do_help(const struct settings *s, int argc UNUSED, + char *argv[] UNUSED) { usage(); } @@ -1100,13 +1389,19 @@ static struct command all_commands[] = { { "dump-tables", 1, 1, do_dump_tables }, { "dump-flows", 1, 2, do_dump_flows }, { "dump-aggregate", 1, 2, do_dump_aggregate }, +#ifdef SUPPORT_SNAT + { "add-snat", 3, 3, do_add_snat }, + { "del-snat", 2, 2, do_del_snat }, +#endif { "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 }, + { "execute", 2, INT_MAX, do_execute }, { NULL, 0, 0, NULL }, };