X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fovs-ofctl.c;h=77a1434ecb1a8aa5d5c224540dcc924528d7fba1;hb=626186c3bea6b07442632684eacf4d02545fa05f;hp=3e9f4628e7140dd6200e0f53ef15077453ebe3b6;hpb=2e0525bcf5ba3f348795f303f8cb69c9fc033ff3;p=openvswitch diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c index 3e9f4628..77a1434e 100644 --- a/utilities/ovs-ofctl.c +++ b/utilities/ovs-ofctl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks. + * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,9 +35,9 @@ #include "compiler.h" #include "dirs.h" #include "dynamic-string.h" -#include "netlink.h" #include "nx-match.h" #include "odp-util.h" +#include "ofp-actions.h" #include "ofp-errors.h" #include "ofp-parse.h" #include "ofp-print.h" @@ -210,6 +210,7 @@ usage(void) " get-frags SWITCH print fragment handling behavior\n" " set-frags SWITCH FRAG_MODE set fragment handling behavior\n" " dump-ports SWITCH [PORT] print port statistics\n" + " dump-ports-desc SWITCH print port descriptions\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" @@ -363,6 +364,7 @@ dump_transaction(const char *vconn_name, struct ofpbuf *request) open_vconn(vconn_name, &vconn); run(vconn_transact(vconn, request, &reply), "talking to %s", vconn_name); ofp_print(stdout, reply->data, reply->size, verbosity + 1); + ofpbuf_delete(reply); vconn_close(vconn); } @@ -378,6 +380,7 @@ static void dump_stats_transaction(const char *vconn_name, struct ofpbuf *request) { ovs_be32 send_xid = ((struct ofp_header *) request->data)->xid; + ovs_be16 stats_type = ((struct ofp_stats_msg *) request->data)->type; struct vconn *vconn; bool done = false; @@ -390,12 +393,21 @@ dump_stats_transaction(const char *vconn_name, struct ofpbuf *request) 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_msg *osm; + const struct ofp_stats_msg *osm = reply->data; + const struct ofp_header *oh = reply->data; ofp_print(stdout, reply->data, reply->size, verbosity + 1); - osm = ofpbuf_at(reply, 0, sizeof *osm); - done = !osm || !(ntohs(osm->flags) & OFPSF_REPLY_MORE); + if (oh->type == OFPT_ERROR) { + done = true; + } else if (oh->type == OFPT10_STATS_REPLY + && osm->type == stats_type) { + done = !(ntohs(osm->flags) & OFPSF_REPLY_MORE); + } else { + ovs_fatal(0, "received bad reply: %s", + ofp_to_string(reply->data, reply->size, + verbosity + 1)); + } } else { VLOG_DBG("received reply with xid %08"PRIx32" " "!= expected %08"PRIx32, recv_xid, send_xid); @@ -492,70 +504,191 @@ set_switch_config(struct vconn *vconn, struct ofp_switch_config *config_) } static void -do_show(int argc OVS_UNUSED, char *argv[]) +ofctl_show(int argc OVS_UNUSED, char *argv[]) { - dump_trivial_transaction(argv[1], OFPT_FEATURES_REQUEST); - dump_trivial_transaction(argv[1], OFPT_GET_CONFIG_REQUEST); + const char *vconn_name = argv[1]; + struct vconn *vconn; + struct ofpbuf *request; + struct ofpbuf *reply; + bool trunc; + + make_openflow(sizeof(struct ofp_header), OFPT_FEATURES_REQUEST, + &request); + open_vconn(vconn_name, &vconn); + run(vconn_transact(vconn, request, &reply), "talking to %s", vconn_name); + + trunc = ofputil_switch_features_ports_trunc(reply); + ofp_print(stdout, reply->data, reply->size, verbosity + 1); + + ofpbuf_delete(reply); + vconn_close(vconn); + + if (trunc) { + /* The Features Reply may not contain all the ports, so send a + * Port Description stats request, which doesn't have size + * constraints. */ + dump_trivial_stats_transaction(vconn_name, OFPST_PORT_DESC); + } + dump_trivial_transaction(vconn_name, OFPT_GET_CONFIG_REQUEST); } static void -do_dump_desc(int argc OVS_UNUSED, char *argv[]) +ofctl_dump_desc(int argc OVS_UNUSED, char *argv[]) { dump_trivial_stats_transaction(argv[1], OFPST_DESC); } static void -do_dump_tables(int argc OVS_UNUSED, char *argv[]) +ofctl_dump_tables(int argc OVS_UNUSED, char *argv[]) { dump_trivial_stats_transaction(argv[1], OFPST_TABLE); } -/* Opens a connection to 'vconn_name', fetches the port structure for - * 'port_name' (which may be a port name or number), and copies it into - * '*oppp'. */ -static void -fetch_ofputil_phy_port(const char *vconn_name, const char *port_name, - struct ofputil_phy_port *pp) +static bool +fetch_port_by_features(const char *vconn_name, + const char *port_name, unsigned int port_no, + struct ofputil_phy_port *pp, bool *trunc) { struct ofputil_switch_features features; const struct ofp_switch_features *osf; struct ofpbuf *request, *reply; - unsigned int port_no; struct vconn *vconn; enum ofperr error; struct ofpbuf b; - - /* Try to interpret the argument as a port number. */ - if (!str_to_uint(port_name, 10, &port_no)) { - port_no = UINT_MAX; - } + bool found = false; /* Fetch the switch's ofp_switch_features. */ make_openflow(sizeof(struct ofp_header), OFPT_FEATURES_REQUEST, &request); open_vconn(vconn_name, &vconn); run(vconn_transact(vconn, request, &reply), "talking to %s", vconn_name); + vconn_close(vconn); osf = reply->data; if (reply->size < sizeof *osf) { ovs_fatal(0, "%s: received too-short features reply (only %zu bytes)", vconn_name, reply->size); } + + *trunc = false; + if (ofputil_switch_features_ports_trunc(reply)) { + *trunc = true; + goto exit; + } + error = ofputil_decode_switch_features(osf, &features, &b); if (error) { ovs_fatal(0, "%s: failed to decode features reply (%s)", vconn_name, ofperr_to_string(error)); } - while (!ofputil_pull_switch_features_port(&b, pp)) { + while (!ofputil_pull_phy_port(osf->header.version, &b, pp)) { if (port_no != UINT_MAX ? port_no == pp->port_no : !strcmp(pp->name, port_name)) { - ofpbuf_delete(reply); - vconn_close(vconn); - return; + found = true; + goto exit; } } - ovs_fatal(0, "%s: couldn't find port `%s'", vconn_name, port_name); + +exit: + ofpbuf_delete(reply); + return found; +} + +static bool +fetch_port_by_stats(const char *vconn_name, + const char *port_name, unsigned int port_no, + struct ofputil_phy_port *pp) +{ + struct ofpbuf *request; + struct vconn *vconn; + ovs_be32 send_xid; + struct ofpbuf b; + bool done = false; + bool found = false; + + alloc_stats_request(sizeof(struct ofp_stats_msg), OFPST_PORT_DESC, + &request); + send_xid = ((struct ofp_header *) request->data)->xid; + + open_vconn(vconn_name, &vconn); + send_openflow_buffer(vconn, request); + 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; + struct ofp_stats_msg *osm; + + ofputil_decode_msg_type(reply->data, &type); + if (ofputil_msg_type_code(type) != OFPUTIL_OFPST_PORT_DESC_REPLY) { + ovs_fatal(0, "received bad reply: %s", + ofp_to_string(reply->data, reply->size, + verbosity + 1)); + } + + osm = ofpbuf_at_assert(reply, 0, sizeof *osm); + done = !(ntohs(osm->flags) & OFPSF_REPLY_MORE); + + if (found) { + /* We've already found the port, but we need to drain + * the queue of any other replies for this request. */ + continue; + } + + ofpbuf_use_const(&b, &osm->header, ntohs(osm->header.length)); + ofpbuf_pull(&b, sizeof(struct ofp_stats_msg)); + + while (!ofputil_pull_phy_port(osm->header.version, &b, pp)) { + if (port_no != UINT_MAX ? port_no == pp->port_no + : !strcmp(pp->name, port_name)) { + found = true; + break; + } + } + } else { + VLOG_DBG("received reply with xid %08"PRIx32" " + "!= expected %08"PRIx32, recv_xid, send_xid); + } + ofpbuf_delete(reply); + } + vconn_close(vconn); + + return found; +} + + +/* Opens a connection to 'vconn_name', fetches the port structure for + * 'port_name' (which may be a port name or number), and copies it into + * '*pp'. */ +static void +fetch_ofputil_phy_port(const char *vconn_name, const char *port_name, + struct ofputil_phy_port *pp) +{ + unsigned int port_no; + bool found; + bool trunc; + + /* Try to interpret the argument as a port number. */ + if (!str_to_uint(port_name, 10, &port_no)) { + port_no = UINT_MAX; + } + + /* Try to find the port based on the Features Reply. If it looks + * like the results may be truncated, then use the Port Description + * stats message introduced in OVS 1.7. */ + found = fetch_port_by_features(vconn_name, port_name, port_no, pp, + &trunc); + if (trunc) { + found = fetch_port_by_stats(vconn_name, port_name, port_no, pp); + } + + if (!found) { + ovs_fatal(0, "%s: couldn't find port `%s'", vconn_name, port_name); + } } /* Returns the port number corresponding to 'port_name' (which may be a port @@ -631,7 +764,7 @@ set_protocol_for_flow_dump(struct vconn *vconn, } static void -do_dump_flows__(int argc, char *argv[], bool aggregate) +ofctl_dump_flows__(int argc, char *argv[], bool aggregate) { enum ofputil_protocol usable_protocols, protocol; struct ofputil_flow_stats_request fsr; @@ -649,19 +782,19 @@ do_dump_flows__(int argc, char *argv[], bool aggregate) } static void -do_dump_flows(int argc, char *argv[]) +ofctl_dump_flows(int argc, char *argv[]) { - return do_dump_flows__(argc, argv, false); + return ofctl_dump_flows__(argc, argv, false); } static void -do_dump_aggregate(int argc, char *argv[]) +ofctl_dump_aggregate(int argc, char *argv[]) { - return do_dump_flows__(argc, argv, true); + return ofctl_dump_flows__(argc, argv, true); } static void -do_queue_stats(int argc, char *argv[]) +ofctl_queue_stats(int argc, char *argv[]) { struct ofp_queue_stats_request *req; struct ofpbuf *request; @@ -726,7 +859,8 @@ open_vconn_for_flow_mod(const char *remote, } static void -do_flow_mod__(const char *remote, struct ofputil_flow_mod *fms, size_t n_fms) +ofctl_flow_mod__(const char *remote, struct ofputil_flow_mod *fms, + size_t n_fms) { enum ofputil_protocol protocol; struct vconn *vconn; @@ -738,56 +872,56 @@ do_flow_mod__(const char *remote, struct ofputil_flow_mod *fms, size_t n_fms) struct ofputil_flow_mod *fm = &fms[i]; transact_noreply(vconn, ofputil_encode_flow_mod(fm, protocol)); - free(fm->actions); + free(fm->ofpacts); } vconn_close(vconn); } static void -do_flow_mod_file(int argc OVS_UNUSED, char *argv[], uint16_t command) +ofctl_flow_mod_file(int argc OVS_UNUSED, char *argv[], uint16_t command) { struct ofputil_flow_mod *fms = NULL; size_t n_fms = 0; parse_ofp_flow_mod_file(argv[2], command, &fms, &n_fms); - do_flow_mod__(argv[1], fms, n_fms); + ofctl_flow_mod__(argv[1], fms, n_fms); free(fms); } static void -do_flow_mod(int argc, char *argv[], uint16_t command) +ofctl_flow_mod(int argc, char *argv[], uint16_t command) { if (argc > 2 && !strcmp(argv[2], "-")) { - do_flow_mod_file(argc, argv, command); + ofctl_flow_mod_file(argc, argv, command); } else { struct ofputil_flow_mod fm; parse_ofp_flow_mod_str(&fm, argc > 2 ? argv[2] : "", command, false); - do_flow_mod__(argv[1], &fm, 1); + ofctl_flow_mod__(argv[1], &fm, 1); } } static void -do_add_flow(int argc, char *argv[]) +ofctl_add_flow(int argc, char *argv[]) { - do_flow_mod(argc, argv, OFPFC_ADD); + ofctl_flow_mod(argc, argv, OFPFC_ADD); } static void -do_add_flows(int argc, char *argv[]) +ofctl_add_flows(int argc, char *argv[]) { - do_flow_mod_file(argc, argv, OFPFC_ADD); + ofctl_flow_mod_file(argc, argv, OFPFC_ADD); } static void -do_mod_flows(int argc, char *argv[]) +ofctl_mod_flows(int argc, char *argv[]) { - do_flow_mod(argc, argv, strict ? OFPFC_MODIFY_STRICT : OFPFC_MODIFY); + ofctl_flow_mod(argc, argv, strict ? OFPFC_MODIFY_STRICT : OFPFC_MODIFY); } static void -do_del_flows(int argc, char *argv[]) +ofctl_del_flows(int argc, char *argv[]) { - do_flow_mod(argc, argv, strict ? OFPFC_DELETE_STRICT : OFPFC_DELETE); + ofctl_flow_mod(argc, argv, strict ? OFPFC_DELETE_STRICT : OFPFC_DELETE); } static void @@ -994,7 +1128,7 @@ monitor_vconn(struct vconn *vconn) time_t now = time_wall(); char s[32]; - strftime(s, sizeof s, "%Y-%m-%d %H:%M:%S: ", localtime(&now)); + strftime(s, sizeof s, "%Y-%m-%d %H:%M:%S: ", gmtime(&now)); fputs(s, stderr); } @@ -1023,7 +1157,7 @@ monitor_vconn(struct vconn *vconn) } static void -do_monitor(int argc, char *argv[]) +ofctl_monitor(int argc, char *argv[]) { struct vconn *vconn; @@ -1062,7 +1196,7 @@ do_monitor(int argc, char *argv[]) } static void -do_snoop(int argc OVS_UNUSED, char *argv[]) +ofctl_snoop(int argc OVS_UNUSED, char *argv[]) { struct vconn *vconn; @@ -1071,7 +1205,7 @@ do_snoop(int argc OVS_UNUSED, char *argv[]) } static void -do_dump_ports(int argc, char *argv[]) +ofctl_dump_ports(int argc, char *argv[]) { struct ofp_port_stats_request *req; struct ofpbuf *request; @@ -1084,7 +1218,13 @@ do_dump_ports(int argc, char *argv[]) } static void -do_probe(int argc OVS_UNUSED, char *argv[]) +ofctl_dump_ports_desc(int argc OVS_UNUSED, char *argv[]) +{ + dump_trivial_stats_transaction(argv[1], OFPST_PORT_DESC); +} + +static void +ofctl_probe(int argc OVS_UNUSED, char *argv[]) { struct ofpbuf *request; struct vconn *vconn; @@ -1101,22 +1241,22 @@ do_probe(int argc OVS_UNUSED, char *argv[]) } static void -do_packet_out(int argc, char *argv[]) +ofctl_packet_out(int argc, char *argv[]) { struct ofputil_packet_out po; - struct ofpbuf actions; + struct ofpbuf ofpacts; struct vconn *vconn; int i; - ofpbuf_init(&actions, sizeof(union ofp_action)); - parse_ofp_actions(argv[3], &actions); + ofpbuf_init(&ofpacts, 64); + parse_ofpacts(argv[3], &ofpacts); po.buffer_id = UINT32_MAX; po.in_port = (!strcasecmp(argv[2], "none") ? OFPP_NONE : !strcasecmp(argv[2], "local") ? OFPP_LOCAL : str_to_port_no(argv[1], argv[2])); - po.actions = actions.data; - po.n_actions = actions.size / sizeof(union ofp_action); + po.ofpacts = ofpacts.data; + po.ofpacts_len = ofpacts.size; open_vconn(argv[1], &vconn); for (i = 4; i < argc; i++) { @@ -1135,15 +1275,35 @@ do_packet_out(int argc, char *argv[]) ofpbuf_delete(packet); } vconn_close(vconn); + ofpbuf_uninit(&ofpacts); } static void -do_mod_port(int argc OVS_UNUSED, char *argv[]) +ofctl_mod_port(int argc OVS_UNUSED, char *argv[]) { + struct ofp_config_flag { + const char *name; /* The flag's name. */ + enum ofputil_port_config bit; /* Bit to turn on or off. */ + bool on; /* Value to set the bit to. */ + }; + static const struct ofp_config_flag flags[] = { + { "up", OFPUTIL_PC_PORT_DOWN, false }, + { "down", OFPUTIL_PC_PORT_DOWN, true }, + { "stp", OFPUTIL_PC_NO_STP, false }, + { "receive", OFPUTIL_PC_NO_RECV, false }, + { "receive-stp", OFPUTIL_PC_NO_RECV_STP, false }, + { "flood", OFPUTIL_PC_NO_FLOOD, false }, + { "forward", OFPUTIL_PC_NO_FWD, false }, + { "packet-in", OFPUTIL_PC_NO_PACKET_IN, false }, + }; + + const struct ofp_config_flag *flag; enum ofputil_protocol protocol; struct ofputil_port_mod pm; struct ofputil_phy_port pp; struct vconn *vconn; + const char *command; + bool not; fetch_ofputil_phy_port(argv[1], argv[2], &pp); @@ -1153,32 +1313,33 @@ do_mod_port(int argc OVS_UNUSED, char *argv[]) pm.mask = 0; pm.advertise = 0; - if (!strcasecmp(argv[3], "up")) { - pm.mask |= OFPUTIL_PC_PORT_DOWN; - } else if (!strcasecmp(argv[3], "down")) { - pm.mask |= OFPUTIL_PC_PORT_DOWN; - pm.config |= OFPUTIL_PC_PORT_DOWN; - } else if (!strcasecmp(argv[3], "flood")) { - pm.mask |= OFPUTIL_PC_NO_FLOOD; - } else if (!strcasecmp(argv[3], "noflood")) { - pm.mask |= OFPUTIL_PC_NO_FLOOD; - pm.config |= OFPUTIL_PC_NO_FLOOD; - } else if (!strcasecmp(argv[3], "forward")) { - pm.mask |= OFPUTIL_PC_NO_FWD; - } else if (!strcasecmp(argv[3], "noforward")) { - pm.mask |= OFPUTIL_PC_NO_FWD; - pm.config |= OFPUTIL_PC_NO_FWD; + if (!strncasecmp(argv[3], "no-", 3)) { + command = argv[3] + 3; + not = true; + } else if (!strncasecmp(argv[3], "no", 2)) { + command = argv[3] + 2; + not = true; } else { - ovs_fatal(0, "unknown mod-port command '%s'", argv[3]); + command = argv[3]; + not = false; + } + for (flag = flags; flag < &flags[ARRAY_SIZE(flags)]; flag++) { + if (!strcasecmp(command, flag->name)) { + pm.mask = flag->bit; + pm.config = flag->on ^ not ? flag->bit : 0; + goto found; + } } + ovs_fatal(0, "unknown mod-port command '%s'", argv[3]); +found: protocol = open_vconn(argv[1], &vconn); transact_noreply(vconn, ofputil_encode_port_mod(&pm, protocol)); vconn_close(vconn); } static void -do_get_frags(int argc OVS_UNUSED, char *argv[]) +ofctl_get_frags(int argc OVS_UNUSED, char *argv[]) { struct ofp_switch_config config; struct vconn *vconn; @@ -1190,7 +1351,7 @@ do_get_frags(int argc OVS_UNUSED, char *argv[]) } static void -do_set_frags(int argc OVS_UNUSED, char *argv[]) +ofctl_set_frags(int argc OVS_UNUSED, char *argv[]) { struct ofp_switch_config config; enum ofp_config_flags mode; @@ -1223,7 +1384,7 @@ do_set_frags(int argc OVS_UNUSED, char *argv[]) } static void -do_ping(int argc, char *argv[]) +ofctl_ping(int argc, char *argv[]) { size_t max_payload = 65535 - sizeof(struct ofp_header); unsigned int payload; @@ -1270,7 +1431,7 @@ do_ping(int argc, char *argv[]) } static void -do_benchmark(int argc OVS_UNUSED, char *argv[]) +ofctl_benchmark(int argc OVS_UNUSED, char *argv[]) { size_t max_payload = 65535 - sizeof(struct ofp_header); struct timeval start, end; @@ -1313,7 +1474,7 @@ do_benchmark(int argc OVS_UNUSED, char *argv[]) } static void -do_help(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) +ofctl_help(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) { usage(); } @@ -1332,8 +1493,8 @@ struct fte_version { uint16_t idle_timeout; uint16_t hard_timeout; uint16_t flags; - union ofp_action *actions; - size_t n_actions; + struct ofpact *ofpacts; + size_t ofpacts_len; }; /* Frees 'version' and the data that it owns. */ @@ -1341,7 +1502,7 @@ static void fte_version_free(struct fte_version *version) { if (version) { - free(version->actions); + free(version->ofpacts); free(version); } } @@ -1356,9 +1517,8 @@ 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)); + && ofpacts_equal(a->ofpacts, a->ofpacts_len, + b->ofpacts, b->ofpacts_len)); } /* Prints 'version' on stdout. Expects the caller to have printed the rule @@ -1379,7 +1539,7 @@ fte_version_print(const struct fte_version *version) } ds_init(&s); - ofp_print_actions(&s, version->actions, version->n_actions); + ofpacts_format(version->ofpacts, version->ofpacts_len, &s); printf(" %s\n", ds_cstr(&s)); ds_destroy(&s); } @@ -1413,6 +1573,7 @@ fte_free_all(struct classifier *cls) classifier_remove(cls, &fte->rule); fte_free(fte); } + classifier_destroy(cls); } /* Searches 'cls' for an FTE matching 'rule', inserting a new one if @@ -1462,12 +1623,12 @@ read_flows_from_file(const char *filename, struct classifier *cls, int index) parse_ofp_str(&fm, OFPFC_ADD, ds_cstr(&s), true); version = xmalloc(sizeof *version); - version->cookie = fm.cookie; + version->cookie = fm.new_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; + version->ofpacts = fm.ofpacts; + version->ofpacts_len = fm.ofpacts_len; usable_protocols &= ofputil_usable_protocols(&fm.cr); @@ -1533,10 +1694,14 @@ read_flows_from_switch(struct vconn *vconn, for (;;) { struct fte_version *version; struct ofputil_flow_stats fs; + struct ofpbuf ofpacts; int retval; - retval = ofputil_decode_flow_stats_reply(&fs, reply, false); + ofpbuf_init(&ofpacts, 64); + retval = ofputil_decode_flow_stats_reply(&fs, reply, false, + &ofpacts); if (retval) { + ofpbuf_uninit(&ofpacts); if (retval != EOF) { ovs_fatal(0, "parse error in reply"); } @@ -1548,9 +1713,8 @@ read_flows_from_switch(struct vconn *vconn, 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); + version->ofpacts = ofpbuf_steal_data(&ofpacts); + version->ofpacts_len = ofpacts.size; fte_insert(cls, &fs.rule, version, index); } @@ -1571,7 +1735,9 @@ fte_make_flow_mod(const struct fte *fte, int index, uint16_t command, struct ofpbuf *ofm; fm.cr = fte->rule; - fm.cookie = version->cookie; + fm.cookie = htonll(0); + fm.cookie_mask = htonll(0); + fm.new_cookie = version->cookie; fm.table_id = 0xff; fm.command = command; fm.idle_timeout = version->idle_timeout; @@ -1581,11 +1747,11 @@ fte_make_flow_mod(const struct fte *fte, int index, uint16_t command, 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; + fm.ofpacts = version->ofpacts; + fm.ofpacts_len = version->ofpacts_len; } else { - fm.actions = NULL; - fm.n_actions = 0; + fm.ofpacts = NULL; + fm.ofpacts_len = 0; } ofm = ofputil_encode_flow_mod(&fm, protocol); @@ -1593,7 +1759,7 @@ fte_make_flow_mod(const struct fte *fte, int index, uint16_t command, } static void -do_replace_flows(int argc OVS_UNUSED, char *argv[]) +ofctl_replace_flows(int argc OVS_UNUSED, char *argv[]) { enum { FILE_IDX = 0, SWITCH_IDX = 1 }; enum ofputil_protocol usable_protocols, protocol; @@ -1663,7 +1829,7 @@ read_flows_from_source(const char *source, struct classifier *cls, int index) } static void -do_diff_flows(int argc OVS_UNUSED, char *argv[]) +ofctl_diff_flows(int argc OVS_UNUSED, char *argv[]) { bool differences = false; struct cls_cursor cursor; @@ -1705,7 +1871,7 @@ do_diff_flows(int argc OVS_UNUSED, char *argv[]) /* Undocumented commands for unit testing. */ static void -do_parse_flows__(struct ofputil_flow_mod *fms, size_t n_fms) +ofctl_parse_flows__(struct ofputil_flow_mod *fms, size_t n_fms) { enum ofputil_protocol usable_protocols; enum ofputil_protocol protocol = 0; @@ -1738,64 +1904,46 @@ do_parse_flows__(struct ofputil_flow_mod *fms, size_t n_fms) ofp_print(stdout, msg->data, msg->size, verbosity); ofpbuf_delete(msg); - free(fm->actions); + free(fm->ofpacts); } } /* "parse-flow FLOW": parses the argument as a flow (like add-flow) and prints * it back to stdout. */ static void -do_parse_flow(int argc OVS_UNUSED, char *argv[]) +ofctl_parse_flow(int argc OVS_UNUSED, char *argv[]) { struct ofputil_flow_mod fm; parse_ofp_flow_mod_str(&fm, argv[1], OFPFC_ADD, false); - do_parse_flows__(&fm, 1); + ofctl_parse_flows__(&fm, 1); } /* "parse-flows FILENAME": reads the named file as a sequence of flows (like * add-flows) and prints each of the flows back to stdout. */ static void -do_parse_flows(int argc OVS_UNUSED, char *argv[]) +ofctl_parse_flows(int argc OVS_UNUSED, char *argv[]) { struct ofputil_flow_mod *fms = NULL; size_t n_fms = 0; parse_ofp_flow_mod_file(argv[1], OFPFC_ADD, &fms, &n_fms); - do_parse_flows__(fms, n_fms); + ofctl_parse_flows__(fms, n_fms); free(fms); } -/* "parse-nx-match": reads a series of nx_match specifications as strings from - * stdin, does some internal fussing with them, and then prints them back as - * strings on stdout. */ static void -do_parse_nx_match(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) +ofctl_parse_nxm__(bool oxm) { struct ds in; ds_init(&in); - while (!ds_get_line(&in, stdin)) { + while (!ds_get_test_line(&in, stdin)) { struct ofpbuf nx_match; struct cls_rule rule; ovs_be64 cookie, cookie_mask; enum ofperr error; int match_len; - char *s; - - /* Delete comments, skip blank lines. */ - s = ds_cstr(&in); - if (*s == '#') { - puts(s); - continue; - } - if (strchr(s, '#')) { - *strchr(s, '#') = '\0'; - } - if (s[strspn(s, " ")] == '\0') { - putchar('\n'); - continue; - } /* Convert string to nx_match. */ ofpbuf_init(&nx_match, 0); @@ -1816,7 +1964,8 @@ do_parse_nx_match(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) /* Convert cls_rule back to nx_match. */ ofpbuf_uninit(&nx_match); ofpbuf_init(&nx_match, 0); - match_len = nx_put_match(&nx_match, &rule, cookie, cookie_mask); + match_len = nx_put_match(&nx_match, oxm, &rule, + cookie, cookie_mask); /* Convert nx_match to string. */ out = nx_match_to_string(nx_match.data, match_len); @@ -1832,10 +1981,274 @@ do_parse_nx_match(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) ds_destroy(&in); } +/* "parse-nxm": reads a series of NXM nx_match specifications as strings from + * stdin, does some internal fussing with them, and then prints them back as + * strings on stdout. */ +static void +ofctl_parse_nxm(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) +{ + return ofctl_parse_nxm__(false); +} + +/* "parse-oxm": reads a series of OXM nx_match specifications as strings from + * stdin, does some internal fussing with them, and then prints them back as + * strings on stdout. */ +static void +ofctl_parse_oxm(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) +{ + return ofctl_parse_nxm__(true); +} + +static void +print_differences(const void *a_, size_t a_len, + const void *b_, size_t b_len) +{ + const uint8_t *a = a_; + const uint8_t *b = b_; + size_t i; + + for (i = 0; i < MIN(a_len, b_len); i++) { + if (a[i] != b[i]) { + printf("%2zu: %02"PRIx8" -> %02"PRIx8"\n", i, a[i], b[i]); + } + } + for (i = a_len; i < b_len; i++) { + printf("%2zu: (none) -> %02"PRIx8"\n", i, b[i]); + } + for (i = b_len; i < a_len; i++) { + printf("%2zu: %02"PRIx8" -> (none)\n", i, a[i]); + } +} + +/* "parse-ofp10-actions": reads a series of OpenFlow 1.0 action specifications + * as hex bytes from stdin, converts them to ofpacts, prints them as strings + * on stdout, and then converts them back to hex bytes and prints any + * differences from the input. */ +static void +ofctl_parse_ofp10_actions(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) +{ + struct ds in; + + ds_init(&in); + while (!ds_get_preprocessed_line(&in, stdin)) { + struct ofpbuf of10_out; + struct ofpbuf of10_in; + struct ofpbuf ofpacts; + enum ofperr error; + size_t size; + struct ds s; + + /* Parse hex bytes. */ + ofpbuf_init(&of10_in, 0); + if (ofpbuf_put_hex(&of10_in, ds_cstr(&in), NULL)[0] != '\0') { + ovs_fatal(0, "Trailing garbage in hex data"); + } + + /* Convert to ofpacts. */ + ofpbuf_init(&ofpacts, 0); + size = of10_in.size; + error = ofpacts_pull_openflow10(&of10_in, of10_in.size, &ofpacts); + if (error) { + printf("bad OF1.1 actions: %s\n\n", ofperr_get_name(error)); + ofpbuf_uninit(&ofpacts); + ofpbuf_uninit(&of10_in); + continue; + } + ofpbuf_push_uninit(&of10_in, size); + + /* Print cls_rule. */ + ds_init(&s); + ofpacts_format(ofpacts.data, ofpacts.size, &s); + puts(ds_cstr(&s)); + ds_destroy(&s); + + /* Convert back to ofp10 actions and print differences from input. */ + ofpbuf_init(&of10_out, 0); + ofpacts_put_openflow10(ofpacts.data, ofpacts.size, &of10_out); + + print_differences(of10_in.data, of10_in.size, + of10_out.data, of10_out.size); + putchar('\n'); + + ofpbuf_uninit(&ofpacts); + ofpbuf_uninit(&of10_in); + ofpbuf_uninit(&of10_out); + } + ds_destroy(&in); +} + +/* "parse-ofp11-match": reads a series of ofp11_match specifications as hex + * bytes from stdin, converts them to cls_rules, prints them as strings on + * stdout, and then converts them back to hex bytes and prints any differences + * from the input. */ +static void +ofctl_parse_ofp11_match(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) +{ + struct ds in; + + ds_init(&in); + while (!ds_get_preprocessed_line(&in, stdin)) { + struct ofpbuf match_in; + struct ofp11_match match_out; + struct cls_rule rule; + enum ofperr error; + + /* Parse hex bytes. */ + ofpbuf_init(&match_in, 0); + if (ofpbuf_put_hex(&match_in, ds_cstr(&in), NULL)[0] != '\0') { + ovs_fatal(0, "Trailing garbage in hex data"); + } + if (match_in.size != sizeof(struct ofp11_match)) { + ovs_fatal(0, "Input is %zu bytes, expected %zu", + match_in.size, sizeof(struct ofp11_match)); + } + + /* Convert to cls_rule. */ + error = ofputil_cls_rule_from_ofp11_match(match_in.data, + OFP_DEFAULT_PRIORITY, &rule); + if (error) { + printf("bad ofp11_match: %s\n\n", ofperr_get_name(error)); + ofpbuf_uninit(&match_in); + continue; + } + + /* Print cls_rule. */ + cls_rule_print(&rule); + + /* Convert back to ofp11_match and print differences from input. */ + ofputil_cls_rule_to_ofp11_match(&rule, &match_out); + + print_differences(match_in.data, match_in.size, + &match_out, sizeof match_out); + putchar('\n'); + + ofpbuf_uninit(&match_in); + } + ds_destroy(&in); +} + +/* "parse-ofp11-actions": reads a series of OpenFlow 1.1 action specifications + * as hex bytes from stdin, converts them to ofpacts, prints them as strings + * on stdout, and then converts them back to hex bytes and prints any + * differences from the input. */ +static void +ofctl_parse_ofp11_actions(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) +{ + struct ds in; + + ds_init(&in); + while (!ds_get_preprocessed_line(&in, stdin)) { + struct ofpbuf of11_out; + struct ofpbuf of11_in; + struct ofpbuf ofpacts; + enum ofperr error; + size_t size; + struct ds s; + + /* Parse hex bytes. */ + ofpbuf_init(&of11_in, 0); + if (ofpbuf_put_hex(&of11_in, ds_cstr(&in), NULL)[0] != '\0') { + ovs_fatal(0, "Trailing garbage in hex data"); + } + + /* Convert to ofpacts. */ + ofpbuf_init(&ofpacts, 0); + size = of11_in.size; + error = ofpacts_pull_openflow11_actions(&of11_in, of11_in.size, + &ofpacts); + if (error) { + printf("bad OF1.1 actions: %s\n\n", ofperr_get_name(error)); + ofpbuf_uninit(&ofpacts); + ofpbuf_uninit(&of11_in); + continue; + } + ofpbuf_push_uninit(&of11_in, size); + + /* Print cls_rule. */ + ds_init(&s); + ofpacts_format(ofpacts.data, ofpacts.size, &s); + puts(ds_cstr(&s)); + ds_destroy(&s); + + /* Convert back to ofp11 actions and print differences from input. */ + ofpbuf_init(&of11_out, 0); + ofpacts_put_openflow11_actions(ofpacts.data, ofpacts.size, &of11_out); + + print_differences(of11_in.data, of11_in.size, + of11_out.data, of11_out.size); + putchar('\n'); + + ofpbuf_uninit(&ofpacts); + ofpbuf_uninit(&of11_in); + ofpbuf_uninit(&of11_out); + } + ds_destroy(&in); +} + +/* "parse-ofp11-instructions": reads a series of OpenFlow 1.1 instruction + * specifications as hex bytes from stdin, converts them to ofpacts, prints + * them as strings on stdout, and then converts them back to hex bytes and + * prints any differences from the input. */ +static void +ofctl_parse_ofp11_instructions(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) +{ + struct ds in; + + ds_init(&in); + while (!ds_get_preprocessed_line(&in, stdin)) { + struct ofpbuf of11_out; + struct ofpbuf of11_in; + struct ofpbuf ofpacts; + enum ofperr error; + size_t size; + struct ds s; + + /* Parse hex bytes. */ + ofpbuf_init(&of11_in, 0); + if (ofpbuf_put_hex(&of11_in, ds_cstr(&in), NULL)[0] != '\0') { + ovs_fatal(0, "Trailing garbage in hex data"); + } + + /* Convert to ofpacts. */ + ofpbuf_init(&ofpacts, 0); + size = of11_in.size; + error = ofpacts_pull_openflow11_instructions(&of11_in, of11_in.size, + &ofpacts); + if (error) { + printf("bad OF1.1 instructions: %s\n\n", ofperr_get_name(error)); + ofpbuf_uninit(&ofpacts); + ofpbuf_uninit(&of11_in); + continue; + } + ofpbuf_push_uninit(&of11_in, size); + + /* Print cls_rule. */ + ds_init(&s); + ofpacts_format(ofpacts.data, ofpacts.size, &s); + puts(ds_cstr(&s)); + ds_destroy(&s); + + /* Convert back to ofp11 instructions and print differences from + * input. */ + ofpbuf_init(&of11_out, 0); + ofpacts_put_openflow11_instructions(ofpacts.data, ofpacts.size, + &of11_out); + + print_differences(of11_in.data, of11_in.size, + of11_out.data, of11_out.size); + putchar('\n'); + + ofpbuf_uninit(&ofpacts); + ofpbuf_uninit(&of11_in); + ofpbuf_uninit(&of11_out); + } + ds_destroy(&in); +} + /* "print-error ENUM": Prints the type and code of ENUM for every OpenFlow * version. */ static void -do_print_error(int argc OVS_UNUSED, char *argv[]) +ofctl_print_error(int argc OVS_UNUSED, char *argv[]) { enum ofperr error; int version; @@ -1864,7 +2277,7 @@ do_print_error(int argc OVS_UNUSED, char *argv[]) * binary data, interpreting them as an OpenFlow message, and prints the * OpenFlow message on stdout, at VERBOSITY (level 2 by default). */ static void -do_ofp_print(int argc, char *argv[]) +ofctl_ofp_print(int argc, char *argv[]) { struct ofpbuf packet; @@ -1877,36 +2290,43 @@ do_ofp_print(int argc, char *argv[]) } static const struct command all_commands[] = { - { "show", 1, 1, do_show }, - { "monitor", 1, 3, do_monitor }, - { "snoop", 1, 1, do_snoop }, - { "dump-desc", 1, 1, do_dump_desc }, - { "dump-tables", 1, 1, do_dump_tables }, - { "dump-flows", 1, 2, do_dump_flows }, - { "dump-aggregate", 1, 2, do_dump_aggregate }, - { "queue-stats", 1, 3, do_queue_stats }, - { "add-flow", 2, 2, do_add_flow }, - { "add-flows", 2, 2, do_add_flows }, - { "mod-flows", 2, 2, do_mod_flows }, - { "del-flows", 1, 2, do_del_flows }, - { "replace-flows", 2, 2, do_replace_flows }, - { "diff-flows", 2, 2, do_diff_flows }, - { "packet-out", 4, INT_MAX, do_packet_out }, - { "dump-ports", 1, 2, do_dump_ports }, - { "mod-port", 3, 3, do_mod_port }, - { "get-frags", 1, 1, do_get_frags }, - { "set-frags", 2, 2, do_set_frags }, - { "probe", 1, 1, do_probe }, - { "ping", 1, 2, do_ping }, - { "benchmark", 3, 3, do_benchmark }, - { "help", 0, INT_MAX, do_help }, + { "show", 1, 1, ofctl_show }, + { "monitor", 1, 3, ofctl_monitor }, + { "snoop", 1, 1, ofctl_snoop }, + { "dump-desc", 1, 1, ofctl_dump_desc }, + { "dump-tables", 1, 1, ofctl_dump_tables }, + { "dump-flows", 1, 2, ofctl_dump_flows }, + { "dump-aggregate", 1, 2, ofctl_dump_aggregate }, + { "queue-stats", 1, 3, ofctl_queue_stats }, + { "add-flow", 2, 2, ofctl_add_flow }, + { "add-flows", 2, 2, ofctl_add_flows }, + { "mod-flows", 2, 2, ofctl_mod_flows }, + { "del-flows", 1, 2, ofctl_del_flows }, + { "replace-flows", 2, 2, ofctl_replace_flows }, + { "diff-flows", 2, 2, ofctl_diff_flows }, + { "packet-out", 4, INT_MAX, ofctl_packet_out }, + { "dump-ports", 1, 2, ofctl_dump_ports }, + { "dump-ports-desc", 1, 1, ofctl_dump_ports_desc }, + { "mod-port", 3, 3, ofctl_mod_port }, + { "get-frags", 1, 1, ofctl_get_frags }, + { "set-frags", 2, 2, ofctl_set_frags }, + { "probe", 1, 1, ofctl_probe }, + { "ping", 1, 2, ofctl_ping }, + { "benchmark", 3, 3, ofctl_benchmark }, + { "help", 0, INT_MAX, ofctl_help }, /* Undocumented commands for testing. */ - { "parse-flow", 1, 1, do_parse_flow }, - { "parse-flows", 1, 1, do_parse_flows }, - { "parse-nx-match", 0, 0, do_parse_nx_match }, - { "print-error", 1, 1, do_print_error }, - { "ofp-print", 1, 2, do_ofp_print }, + { "parse-flow", 1, 1, ofctl_parse_flow }, + { "parse-flows", 1, 1, ofctl_parse_flows }, + { "parse-nx-match", 0, 0, ofctl_parse_nxm }, + { "parse-nxm", 0, 0, ofctl_parse_nxm }, + { "parse-oxm", 0, 0, ofctl_parse_oxm }, + { "parse-ofp10-actions", 0, 0, ofctl_parse_ofp10_actions }, + { "parse-ofp11-match", 0, 0, ofctl_parse_ofp11_match }, + { "parse-ofp11-actions", 0, 0, ofctl_parse_ofp11_actions }, + { "parse-ofp11-instructions", 0, 0, ofctl_parse_ofp11_instructions }, + { "print-error", 1, 1, ofctl_print_error }, + { "ofp-print", 1, 2, ofctl_ofp_print }, { NULL, 0, 0, NULL }, };