X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-ofctl.c;h=164d0830f6b2803ce048ad5d8542fd819a8ebe6d;hb=81d1ea941425aea5eff1d9582ad12c9b3b528fe8;hp=a96b77a94be9e9634c0ac5b19fe551b7fb16d179;hpb=0fbc9f11c027cce9c89de12525de852e6b2ae332;p=sliver-openvswitch.git diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c index a96b77a94..164d0830f 100644 --- a/utilities/ovs-ofctl.c +++ b/utilities/ovs-ofctl.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -31,7 +32,6 @@ #include "command-line.h" #include "compiler.h" #include "dirs.h" -#include "dpif.h" #include "dynamic-string.h" #include "netlink.h" #include "nx-match.h" @@ -40,6 +40,7 @@ #include "ofp-print.h" #include "ofp-util.h" #include "ofpbuf.h" +#include "ofproto/ofproto.h" #include "openflow/nicira-ext.h" #include "openflow/openflow.h" #include "random.h" @@ -54,6 +55,10 @@ VLOG_DEFINE_THIS_MODULE(ofctl); /* --strict: Use strict matching for flow mod commands? */ static bool strict; +/* --readd: If ture, on replace-flows, re-add even flows that have not changed + * (to reset flow counters). */ +static bool readd; + /* -F, --flow-format: Flow format to use. Either one of NXFF_* to force a * particular flow format or -1 to let ovs-ofctl choose intelligently. */ static int preferred_flow_format = -1; @@ -81,18 +86,20 @@ parse_options(int argc, char *argv[]) { enum { OPT_STRICT = UCHAR_MAX + 1, + OPT_READD, VLOG_OPTION_ENUMS }; static struct option long_options[] = { - {"timeout", required_argument, 0, 't'}, - {"strict", no_argument, 0, OPT_STRICT}, - {"flow-format", required_argument, 0, 'F'}, - {"more", no_argument, 0, 'm'}, - {"help", no_argument, 0, 'h'}, - {"version", no_argument, 0, 'V'}, + {"timeout", required_argument, NULL, 't'}, + {"strict", no_argument, NULL, OPT_STRICT}, + {"readd", no_argument, NULL, OPT_READD}, + {"flow-format", required_argument, NULL, 'F'}, + {"more", no_argument, NULL, 'm'}, + {"help", no_argument, NULL, 'h'}, + {"version", no_argument, NULL, 'V'}, VLOG_LONG_OPTIONS, - STREAM_SSL_LONG_OPTIONS - {0, 0, 0, 0}, + STREAM_SSL_LONG_OPTIONS, + {NULL, 0, NULL, 0}, }; char *short_options = long_options_to_short_options(long_options); @@ -131,13 +138,17 @@ parse_options(int argc, char *argv[]) usage(); case 'V': - OVS_PRINT_VERSION(OFP_VERSION, OFP_VERSION); + ovs_print_version(OFP_VERSION, OFP_VERSION); exit(EXIT_SUCCESS); case OPT_STRICT: strict = true; break; + case OPT_READD: + readd = true; + break; + VLOG_OPTION_HANDLERS STREAM_SSL_OPTION_HANDLERS @@ -158,7 +169,6 @@ usage(void) "usage: %s [OPTIONS] COMMAND [ARG...]\n" "\nFor OpenFlow switches:\n" " show SWITCH show OpenFlow information\n" - " status SWITCH [KEY] report statistics (about KEY)\n" " dump-desc SWITCH print switch description\n" " dump-tables SWITCH print table stats\n" " mod-port SWITCH IFACE ACT modify port behavior\n" @@ -172,6 +182,7 @@ usage(void) " 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" + " replace-flows SWITCH FILE replace flows with those in FILE\n" " monitor SWITCH [MISSLEN] print packets received from SWITCH\n" "\nFor OpenFlow switches and controllers:\n" " probe VCONN probe whether VCONN is up\n" @@ -183,6 +194,7 @@ usage(void) vlog_usage(); printf("\nOther options:\n" " --strict use strict match for flow commands\n" + " --readd replace flows that haven't changed\n" " -F, --flow-format=FORMAT force particular flow format\n" " -m, --more be more verbose printing OpenFlow\n" " -t, --timeout=SECS give up after SECS seconds\n" @@ -199,17 +211,8 @@ static void run(int retval, const char *message, ...) if (retval) { va_list args; - fprintf(stderr, "%s: ", program_name); va_start(args, message); - vfprintf(stderr, message, args); - va_end(args); - if (retval == EOF) { - fputs(": unexpected end of file\n", stderr); - } else { - fprintf(stderr, ": %s\n", strerror(retval)); - } - - exit(EXIT_FAILURE); + ovs_fatal_valist(retval, message, args); } } @@ -229,50 +232,37 @@ static void open_vconn__(const char *name, const char *default_suffix, struct vconn **vconnp) { - struct dpif *dpif; + char *datapath_name, *datapath_type, *socket_name; + char *bridge_path; struct stat s; - char *bridge_path, *datapath_name, *datapath_type; bridge_path = xasprintf("%s/%s.%s", ovs_rundir(), name, default_suffix); - dp_parse_name(name, &datapath_name, &datapath_type); - if (strstr(name, ":")) { + ofproto_parse_name(name, &datapath_name, &datapath_type); + socket_name = xasprintf("%s/%s.%s", + ovs_rundir(), datapath_name, default_suffix); + free(datapath_name); + free(datapath_type); + + if (strchr(name, ':')) { run(vconn_open_block(name, OFP_VERSION, vconnp), "connecting to %s", name); } else if (!stat(name, &s) && S_ISSOCK(s.st_mode)) { open_vconn_socket(name, vconnp); } else if (!stat(bridge_path, &s) && S_ISSOCK(s.st_mode)) { open_vconn_socket(bridge_path, vconnp); - } else if (!dpif_open(datapath_name, datapath_type, &dpif)) { - char dpif_name[IF_NAMESIZE + 1]; - char *socket_name; - - run(dpif_port_get_name(dpif, ODPP_LOCAL, dpif_name, sizeof dpif_name), - "obtaining name of %s", dpif_name); - dpif_close(dpif); - if (strcmp(dpif_name, name)) { - VLOG_DBG("datapath %s is named %s", name, dpif_name); - } - - socket_name = xasprintf("%s/%s.%s", - ovs_rundir(), dpif_name, default_suffix); - if (stat(socket_name, &s)) { - ovs_fatal(errno, "cannot connect to %s: stat failed on %s", - name, socket_name); - } else if (!S_ISSOCK(s.st_mode)) { + } else if (!stat(socket_name, &s)) { + if (!S_ISSOCK(s.st_mode)) { ovs_fatal(0, "cannot connect to %s: %s is not a socket", name, socket_name); } - open_vconn_socket(socket_name, vconnp); - free(socket_name); } else { - ovs_fatal(0, "%s is not a valid connection method", name); + ovs_fatal(0, "%s is not a bridge or a socket", name); } - free(datapath_name); - free(datapath_type); free(bridge_path); + free(socket_name); } static void @@ -282,14 +272,14 @@ open_vconn(const char *name, struct vconn **vconnp) } static void * -alloc_stats_request(size_t body_len, uint16_t type, struct ofpbuf **bufferp) +alloc_stats_request(size_t rq_len, uint16_t type, struct ofpbuf **bufferp) { - struct ofp_stats_request *rq; - rq = make_openflow((offsetof(struct ofp_stats_request, body) - + body_len), OFPT_STATS_REQUEST, bufferp); + struct ofp_stats_msg *rq; + + rq = make_openflow(rq_len, OFPT_STATS_REQUEST, bufferp); rq->type = htons(type); rq->flags = htons(0); - return rq->body; + return rq; } static void @@ -330,18 +320,18 @@ dump_stats_transaction(const char *vconn_name, struct ofpbuf *request) open_vconn(vconn_name, &vconn); send_openflow_buffer(vconn, request); while (!done) { - uint32_t recv_xid; + ovs_be32 recv_xid; struct ofpbuf *reply; run(vconn_recv_block(vconn, &reply), "OpenFlow packet receive failed"); recv_xid = ((struct ofp_header *) reply->data)->xid; if (send_xid == recv_xid) { - struct ofp_stats_reply *osr; + struct ofp_stats_msg *osm; ofp_print(stdout, reply->data, reply->size, verbosity + 1); - osr = ofpbuf_at(reply, 0, sizeof *osr); - done = !osr || !(ntohs(osr->flags) & OFPSF_REPLY_MORE); + osm = ofpbuf_at(reply, 0, sizeof *osm); + done = !osm || !(ntohs(osm->flags) & OFPSF_REPLY_MORE); } else { VLOG_DBG("received reply with xid %08"PRIx32" " "!= expected %08"PRIx32, recv_xid, send_xid); @@ -355,7 +345,7 @@ static void dump_trivial_stats_transaction(const char *vconn_name, uint8_t stats_type) { struct ofpbuf *request; - alloc_stats_request(0, stats_type, &request); + alloc_stats_request(sizeof(struct ofp_stats_msg), stats_type, &request); dump_stats_transaction(vconn_name, request); } @@ -400,36 +390,6 @@ do_show(int argc OVS_UNUSED, char *argv[]) dump_trivial_transaction(argv[1], OFPT_GET_CONFIG_REQUEST); } -static void -do_status(int argc, char *argv[]) -{ - struct nicira_header *request, *reply; - struct vconn *vconn; - struct ofpbuf *b; - - request = make_nxmsg(sizeof *request, NXT_STATUS_REQUEST, &b); - if (argc > 2) { - ofpbuf_put(b, argv[2], strlen(argv[2])); - update_openflow_length(b); - } - open_vconn(argv[1], &vconn); - run(vconn_transact(vconn, b, &b), "talking to %s", argv[1]); - vconn_close(vconn); - - if (b->size < sizeof *reply) { - ovs_fatal(0, "short reply (%zu bytes)", b->size); - } - reply = b->data; - if (reply->header.type != OFPT_VENDOR - || reply->vendor != ntohl(NX_VENDOR_ID) - || reply->subtype != ntohl(NXT_STATUS_REPLY)) { - ofp_print(stderr, b->data, b->size, verbosity + 2); - ovs_fatal(0, "bad reply"); - } - - fwrite(reply + 1, b->size - sizeof *reply, 1, stdout); -} - static void do_dump_desc(int argc OVS_UNUSED, char *argv[]) { @@ -537,50 +497,52 @@ set_flow_format(struct vconn *vconn, enum nx_flow_format flow_format) } static enum nx_flow_format -negotiate_highest_flow_format(struct vconn *vconn, const struct cls_rule *rule, - bool cookie_support, ovs_be64 cookie) +negotiate_highest_flow_format(struct vconn *vconn, + enum nx_flow_format min_format) { - int flow_format; - if (preferred_flow_format != -1) { - enum nx_flow_format min_format; + if (preferred_flow_format < min_format) { + ovs_fatal(0, "%s: cannot use requested flow format %s for " + "specified flow", vconn_get_name(vconn), + ofputil_flow_format_to_string(min_format)); + } + + set_flow_format(vconn, preferred_flow_format); + return preferred_flow_format; + } else { + enum nx_flow_format flow_format; - min_format = ofputil_min_flow_format(rule, cookie_support, cookie); - if (preferred_flow_format >= min_format) { - set_flow_format(vconn, preferred_flow_format); - return preferred_flow_format; + if (try_set_flow_format(vconn, NXFF_NXM)) { + flow_format = NXFF_NXM; + } else { + flow_format = NXFF_OPENFLOW10; } - VLOG_WARN("%s: cannot use requested flow format %s for " - "specified flow", vconn_get_name(vconn), - ofputil_flow_format_to_string(min_format)); - } + if (flow_format < min_format) { + ovs_fatal(0, "%s: cannot use switch's most advanced flow format " + "%s for specified flow", vconn_get_name(vconn), + ofputil_flow_format_to_string(min_format)); + } - if (try_set_flow_format(vconn, NXFF_NXM)) { - flow_format = NXFF_NXM; - } else if (try_set_flow_format(vconn, NXFF_TUN_ID_FROM_COOKIE)) { - flow_format = NXFF_TUN_ID_FROM_COOKIE; - } else { - flow_format = NXFF_OPENFLOW10; + VLOG_DBG("%s: negotiated flow format %s", vconn_get_name(vconn), + ofputil_flow_format_to_string(flow_format)); + return flow_format; } - - VLOG_DBG("%s: negotiated flow format %s", vconn_get_name(vconn), - ofputil_flow_format_to_string(flow_format)); - return flow_format; } static void do_dump_flows__(int argc, char *argv[], bool aggregate) { - enum nx_flow_format flow_format; - struct flow_stats_request fsr; + enum nx_flow_format min_flow_format, flow_format; + struct ofputil_flow_stats_request fsr; struct ofpbuf *request; struct vconn *vconn; parse_ofp_flow_stats_request_str(&fsr, aggregate, argc > 2 ? argv[2] : ""); open_vconn(argv[1], &vconn); - flow_format = negotiate_highest_flow_format(vconn, &fsr.match, false, 0); + min_flow_format = ofputil_min_flow_format(&fsr.match); + flow_format = negotiate_highest_flow_format(vconn, min_flow_format); request = ofputil_encode_flow_stats_request(&fsr, flow_format); dump_stats_transaction(argv[1], request); vconn_close(vconn); @@ -651,7 +613,7 @@ set_initial_format_for_flow_mod(struct list *requests) static void check_final_format_for_flow_mod(enum nx_flow_format flow_format) { - if (preferred_flow_format >= 0 && flow_format != preferred_flow_format) { + if (preferred_flow_format >= 0 && flow_format > preferred_flow_format) { ovs_fatal(0, "flow cannot be expressed in flow format %s " "(flow format %s or better is required)", ofputil_flow_format_to_string(preferred_flow_format), @@ -660,54 +622,72 @@ check_final_format_for_flow_mod(enum nx_flow_format flow_format) } static void -do_flow_mod__(int argc OVS_UNUSED, char *argv[], uint16_t command) +do_flow_mod_file__(int argc OVS_UNUSED, char *argv[], uint16_t command) { enum nx_flow_format flow_format; + bool flow_mod_table_id; struct list requests; struct vconn *vconn; + FILE *file; + + file = !strcmp(argv[2], "-") ? stdin : fopen(argv[2], "r"); + if (file == NULL) { + ovs_fatal(errno, "%s: open", argv[2]); + } list_init(&requests); flow_format = set_initial_format_for_flow_mod(&requests); - - parse_ofp_flow_mod_str(&requests, &flow_format, argc > 2 ? argv[2] : "", - command); - check_final_format_for_flow_mod(flow_format); + flow_mod_table_id = false; open_vconn(argv[1], &vconn); - transact_multiple_noreply(vconn, &requests); + while (parse_ofp_flow_mod_file(&requests, &flow_format, &flow_mod_table_id, + file, command)) { + check_final_format_for_flow_mod(flow_format); + transact_multiple_noreply(vconn, &requests); + } vconn_close(vconn); -} -static void -do_add_flow(int argc, char *argv[]) -{ - do_flow_mod__(argc, argv, OFPFC_ADD); + if (file != stdin) { + fclose(file); + } } static void -do_add_flows(int argc OVS_UNUSED, char *argv[]) +do_flow_mod__(int argc, char *argv[], uint16_t command) { enum nx_flow_format flow_format; + bool flow_mod_table_id; struct list requests; struct vconn *vconn; - FILE *file; - file = fopen(argv[2], "r"); - if (file == NULL) { - ovs_fatal(errno, "%s: open", argv[2]); + if (argc > 2 && !strcmp(argv[2], "-")) { + do_flow_mod_file__(argc, argv, command); + return; } list_init(&requests); flow_format = set_initial_format_for_flow_mod(&requests); + flow_mod_table_id = false; + + parse_ofp_flow_mod_str(&requests, &flow_format, &flow_mod_table_id, + argc > 2 ? argv[2] : "", command, false); + check_final_format_for_flow_mod(flow_format); open_vconn(argv[1], &vconn); - while (parse_ofp_add_flow_file(&requests, &flow_format, file)) { - check_final_format_for_flow_mod(flow_format); - transact_multiple_noreply(vconn, &requests); - } + transact_multiple_noreply(vconn, &requests); vconn_close(vconn); +} - fclose(file); +static void +do_add_flow(int argc, char *argv[]) +{ + do_flow_mod__(argc, argv, OFPFC_ADD); +} + +static void +do_add_flows(int argc, char *argv[]) +{ + do_flow_mod_file__(argc, argv, OFPFC_ADD); } static void @@ -849,9 +829,9 @@ do_ping(int argc, char *argv[]) OFPT_ECHO_REQUEST, &request); random_bytes(rq_hdr + 1, payload); - gettimeofday(&start, NULL); + xgettimeofday(&start); run(vconn_transact(vconn, ofpbuf_clone(request), &reply), "transact"); - gettimeofday(&end, NULL); + xgettimeofday(&end); rpy_hdr = reply->data; if (reply->size != request->size @@ -896,7 +876,7 @@ do_benchmark(int argc OVS_UNUSED, char *argv[]) count, message_size, count * message_size); open_vconn(argv[1], &vconn); - gettimeofday(&start, NULL); + xgettimeofday(&start); for (i = 0; i < count; i++) { struct ofpbuf *request, *reply; struct ofp_header *rq_hdr; @@ -906,7 +886,7 @@ do_benchmark(int argc OVS_UNUSED, char *argv[]) run(vconn_transact(vconn, request, &reply), "transact"); ofpbuf_delete(reply); } - gettimeofday(&end, NULL); + xgettimeofday(&end); vconn_close(vconn); duration = ((1000*(double)(end.tv_sec - start.tv_sec)) @@ -922,6 +902,391 @@ do_help(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) usage(); } +/* replace-flows and diff-flows commands. */ + +/* A flow table entry, possibly with two different versions. */ +struct fte { + struct cls_rule rule; /* Within a "struct classifier". */ + struct fte_version *versions[2]; +}; + +/* One version of a Flow Table Entry. */ +struct fte_version { + ovs_be64 cookie; + uint16_t idle_timeout; + uint16_t hard_timeout; + uint16_t flags; + union ofp_action *actions; + size_t n_actions; +}; + +/* Frees 'version' and the data that it owns. */ +static void +fte_version_free(struct fte_version *version) +{ + if (version) { + free(version->actions); + free(version); + } +} + +/* Returns true if 'a' and 'b' are the same, false if they differ. + * + * Ignores differences in 'flags' because there's no way to retrieve flags from + * an OpenFlow switch. We have to assume that they are the same. */ +static bool +fte_version_equals(const struct fte_version *a, const struct fte_version *b) +{ + return (a->cookie == b->cookie + && a->idle_timeout == b->idle_timeout + && a->hard_timeout == b->hard_timeout + && a->n_actions == b->n_actions + && !memcmp(a->actions, b->actions, + a->n_actions * sizeof *a->actions)); +} + +/* Prints 'version' on stdout. Expects the caller to have printed the rule + * associated with the version. */ +static void +fte_version_print(const struct fte_version *version) +{ + struct ds s; + + if (version->cookie != htonll(0)) { + printf(" cookie=0x%"PRIx64, ntohll(version->cookie)); + } + if (version->idle_timeout != OFP_FLOW_PERMANENT) { + printf(" idle_timeout=%"PRIu16, version->idle_timeout); + } + if (version->hard_timeout != OFP_FLOW_PERMANENT) { + printf(" hard_timeout=%"PRIu16, version->hard_timeout); + } + + ds_init(&s); + ofp_print_actions(&s, version->actions, version->n_actions); + printf(" %s\n", ds_cstr(&s)); + ds_destroy(&s); +} + +static struct fte * +fte_from_cls_rule(const struct cls_rule *cls_rule) +{ + return cls_rule ? CONTAINER_OF(cls_rule, struct fte, rule) : NULL; +} + +/* Frees 'fte' and its versions. */ +static void +fte_free(struct fte *fte) +{ + if (fte) { + fte_version_free(fte->versions[0]); + fte_version_free(fte->versions[1]); + free(fte); + } +} + +/* Frees all of the FTEs within 'cls'. */ +static void +fte_free_all(struct classifier *cls) +{ + struct cls_cursor cursor; + struct fte *fte, *next; + + cls_cursor_init(&cursor, cls, NULL); + CLS_CURSOR_FOR_EACH_SAFE (fte, next, rule, &cursor) { + classifier_remove(cls, &fte->rule); + fte_free(fte); + } +} + +/* Searches 'cls' for an FTE matching 'rule', inserting a new one if + * necessary. Sets 'version' as the version of that rule with the given + * 'index', replacing any existing version, if any. + * + * Takes ownership of 'version'. */ +static void +fte_insert(struct classifier *cls, const struct cls_rule *rule, + struct fte_version *version, int index) +{ + struct fte *old, *fte; + + fte = xzalloc(sizeof *fte); + fte->rule = *rule; + fte->versions[index] = version; + + old = fte_from_cls_rule(classifier_replace(cls, &fte->rule)); + if (old) { + fte_version_free(old->versions[index]); + fte->versions[!index] = old->versions[!index]; + free(old); + } +} + +/* Reads the flows in 'filename' as flow table entries in 'cls' for the version + * with the specified 'index'. Returns the minimum flow format required to + * represent the flows that were read. */ +static enum nx_flow_format +read_flows_from_file(const char *filename, struct classifier *cls, int index) +{ + enum nx_flow_format min_flow_format; + struct ds s; + FILE *file; + + file = !strcmp(filename, "-") ? stdin : fopen(filename, "r"); + if (file == NULL) { + ovs_fatal(errno, "%s: open", filename); + } + + ds_init(&s); + min_flow_format = NXFF_OPENFLOW10; + while (!ds_get_preprocessed_line(&s, file)) { + struct fte_version *version; + struct ofputil_flow_mod fm; + enum nx_flow_format min_ff; + + parse_ofp_str(&fm, OFPFC_ADD, ds_cstr(&s), true); + + version = xmalloc(sizeof *version); + version->cookie = fm.cookie; + version->idle_timeout = fm.idle_timeout; + version->hard_timeout = fm.hard_timeout; + version->flags = fm.flags & (OFPFF_SEND_FLOW_REM | OFPFF_EMERG); + version->actions = fm.actions; + version->n_actions = fm.n_actions; + + min_ff = ofputil_min_flow_format(&fm.cr); + min_flow_format = MAX(min_flow_format, min_ff); + check_final_format_for_flow_mod(min_flow_format); + + fte_insert(cls, &fm.cr, version, index); + } + ds_destroy(&s); + + if (file != stdin) { + fclose(file); + } + + return min_flow_format; +} + +/* Reads the OpenFlow flow table from 'vconn', which has currently active flow + * format 'flow_format', and adds them as flow table entries in 'cls' for the + * version with the specified 'index'. */ +static void +read_flows_from_switch(struct vconn *vconn, enum nx_flow_format flow_format, + struct classifier *cls, int index) +{ + struct ofputil_flow_stats_request fsr; + struct ofpbuf *request; + ovs_be32 send_xid; + bool done; + + fsr.aggregate = false; + cls_rule_init_catchall(&fsr.match, 0); + fsr.out_port = OFPP_NONE; + fsr.table_id = 0xff; + request = ofputil_encode_flow_stats_request(&fsr, flow_format); + send_xid = ((struct ofp_header *) request->data)->xid; + send_openflow_buffer(vconn, request); + + done = false; + while (!done) { + ovs_be32 recv_xid; + struct ofpbuf *reply; + + run(vconn_recv_block(vconn, &reply), "OpenFlow packet receive failed"); + recv_xid = ((struct ofp_header *) reply->data)->xid; + if (send_xid == recv_xid) { + const struct ofputil_msg_type *type; + const struct ofp_stats_msg *osm; + enum ofputil_msg_code code; + + ofputil_decode_msg_type(reply->data, &type); + code = ofputil_msg_type_code(type); + if (code != OFPUTIL_OFPST_FLOW_REPLY && + code != OFPUTIL_NXST_FLOW_REPLY) { + ovs_fatal(0, "received bad reply: %s", + ofp_to_string(reply->data, reply->size, + verbosity + 1)); + } + + osm = reply->data; + if (!(osm->flags & htons(OFPSF_REPLY_MORE))) { + done = true; + } + + for (;;) { + struct fte_version *version; + struct ofputil_flow_stats fs; + int retval; + + retval = ofputil_decode_flow_stats_reply(&fs, reply); + if (retval) { + if (retval != EOF) { + ovs_fatal(0, "parse error in reply"); + } + break; + } + + version = xmalloc(sizeof *version); + version->cookie = fs.cookie; + version->idle_timeout = fs.idle_timeout; + version->hard_timeout = fs.hard_timeout; + version->flags = 0; + version->n_actions = fs.n_actions; + version->actions = xmemdup(fs.actions, + fs.n_actions * sizeof *fs.actions); + + fte_insert(cls, &fs.rule, version, index); + } + } else { + VLOG_DBG("received reply with xid %08"PRIx32" " + "!= expected %08"PRIx32, recv_xid, send_xid); + } + ofpbuf_delete(reply); + } +} + +static void +fte_make_flow_mod(const struct fte *fte, int index, uint16_t command, + enum nx_flow_format flow_format, struct list *packets) +{ + const struct fte_version *version = fte->versions[index]; + struct ofputil_flow_mod fm; + struct ofpbuf *ofm; + + fm.cr = fte->rule; + fm.cookie = version->cookie; + fm.table_id = 0xff; + fm.command = command; + fm.idle_timeout = version->idle_timeout; + fm.hard_timeout = version->hard_timeout; + fm.buffer_id = UINT32_MAX; + fm.out_port = OFPP_NONE; + fm.flags = version->flags; + if (command == OFPFC_ADD || command == OFPFC_MODIFY || + command == OFPFC_MODIFY_STRICT) { + fm.actions = version->actions; + fm.n_actions = version->n_actions; + } else { + fm.actions = NULL; + fm.n_actions = 0; + } + + ofm = ofputil_encode_flow_mod(&fm, flow_format, false); + list_push_back(packets, &ofm->list_node); +} + +static void +do_replace_flows(int argc OVS_UNUSED, char *argv[]) +{ + enum { FILE_IDX = 0, SWITCH_IDX = 1 }; + enum nx_flow_format min_flow_format, flow_format; + struct cls_cursor cursor; + struct classifier cls; + struct list requests; + struct vconn *vconn; + struct fte *fte; + + classifier_init(&cls); + min_flow_format = read_flows_from_file(argv[2], &cls, FILE_IDX); + + open_vconn(argv[1], &vconn); + flow_format = negotiate_highest_flow_format(vconn, min_flow_format); + read_flows_from_switch(vconn, flow_format, &cls, SWITCH_IDX); + + list_init(&requests); + + /* Delete flows that exist on the switch but not in the file. */ + cls_cursor_init(&cursor, &cls, NULL); + CLS_CURSOR_FOR_EACH (fte, rule, &cursor) { + struct fte_version *file_ver = fte->versions[FILE_IDX]; + struct fte_version *sw_ver = fte->versions[SWITCH_IDX]; + + if (sw_ver && !file_ver) { + fte_make_flow_mod(fte, SWITCH_IDX, OFPFC_DELETE_STRICT, + flow_format, &requests); + } + } + + /* Add flows that exist in the file but not on the switch. + * Update flows that exist in both places but differ. */ + cls_cursor_init(&cursor, &cls, NULL); + CLS_CURSOR_FOR_EACH (fte, rule, &cursor) { + struct fte_version *file_ver = fte->versions[FILE_IDX]; + struct fte_version *sw_ver = fte->versions[SWITCH_IDX]; + + if (file_ver + && (readd || !sw_ver || !fte_version_equals(sw_ver, file_ver))) { + fte_make_flow_mod(fte, FILE_IDX, OFPFC_ADD, flow_format, + &requests); + } + } + transact_multiple_noreply(vconn, &requests); + vconn_close(vconn); + + fte_free_all(&cls); +} + +static void +read_flows_from_source(const char *source, struct classifier *cls, int index) +{ + struct stat s; + + if (source[0] == '/' || source[0] == '.' + || (!strchr(source, ':') && !stat(source, &s))) { + read_flows_from_file(source, cls, index); + } else { + enum nx_flow_format flow_format; + struct vconn *vconn; + + open_vconn(source, &vconn); + flow_format = negotiate_highest_flow_format(vconn, NXFF_OPENFLOW10); + read_flows_from_switch(vconn, flow_format, cls, index); + vconn_close(vconn); + } +} + +static void +do_diff_flows(int argc OVS_UNUSED, char *argv[]) +{ + bool differences = false; + struct cls_cursor cursor; + struct classifier cls; + struct fte *fte; + + classifier_init(&cls); + read_flows_from_source(argv[1], &cls, 0); + read_flows_from_source(argv[2], &cls, 1); + + cls_cursor_init(&cursor, &cls, NULL); + CLS_CURSOR_FOR_EACH (fte, rule, &cursor) { + struct fte_version *a = fte->versions[0]; + struct fte_version *b = fte->versions[1]; + + if (!a || !b || !fte_version_equals(a, b)) { + char *rule_s = cls_rule_to_string(&fte->rule); + if (a) { + printf("-%s", rule_s); + fte_version_print(a); + } + if (b) { + printf("+%s", rule_s); + fte_version_print(b); + } + free(rule_s); + + differences = true; + } + } + + fte_free_all(&cls); + + if (differences) { + exit(2); + } +} + /* Undocumented commands for unit testing. */ static void @@ -942,15 +1307,18 @@ static void do_parse_flow(int argc OVS_UNUSED, char *argv[]) { enum nx_flow_format flow_format; + bool flow_mod_table_id; struct list packets; flow_format = NXFF_OPENFLOW10; if (preferred_flow_format > 0) { flow_format = preferred_flow_format; } + flow_mod_table_id = false; list_init(&packets); - parse_ofp_flow_mod_str(&packets, &flow_format, argv[1], OFPFC_ADD); + parse_ofp_flow_mod_str(&packets, &flow_format, &flow_mod_table_id, + argv[1], OFPFC_ADD, false); print_packet_list(&packets); } @@ -960,6 +1328,7 @@ static void do_parse_flows(int argc OVS_UNUSED, char *argv[]) { enum nx_flow_format flow_format; + bool flow_mod_table_id; struct list packets; FILE *file; @@ -972,9 +1341,11 @@ do_parse_flows(int argc OVS_UNUSED, char *argv[]) if (preferred_flow_format > 0) { flow_format = preferred_flow_format; } + flow_mod_table_id = false; list_init(&packets); - while (parse_ofp_add_flow_file(&packets, &flow_format, file)) { + while (parse_ofp_flow_mod_file(&packets, &flow_format, &flow_mod_table_id, + file, OFPFC_ADD)) { print_packet_list(&packets); } fclose(file); @@ -1029,7 +1400,8 @@ do_parse_nx_match(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) puts(out); free(out); } else { - printf("nx_pull_match() returned error %x\n", error); + printf("nx_pull_match() returned error %x (%s)\n", error, + ofputil_error_to_string(error)); } ofpbuf_uninit(&nx_match); @@ -1055,7 +1427,6 @@ do_ofp_print(int argc, char *argv[]) static const struct command all_commands[] = { { "show", 1, 1, do_show }, - { "status", 1, 2, do_status }, { "monitor", 1, 2, do_monitor }, { "snoop", 1, 1, do_snoop }, { "dump-desc", 1, 1, do_dump_desc }, @@ -1067,6 +1438,8 @@ static const struct command all_commands[] = { { "add-flows", 2, 2, do_add_flows }, { "mod-flows", 2, 2, do_mod_flows }, { "del-flows", 1, 2, do_del_flows }, + { "replace-flows", 2, 2, do_replace_flows }, + { "diff-flows", 2, 2, do_diff_flows }, { "dump-ports", 1, 2, do_dump_ports }, { "mod-port", 3, 3, do_mod_port }, { "probe", 1, 1, do_probe },