/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* "snoop" command? */
static bool timestamp;
+/* --unixctl-path: Path to use for unixctl server, for "monitor" and "snoop"
+ commands. */
+static char *unixctl_path;
+
/* --sort, --rsort: Sort order. */
enum sort_order { SORT_ASC, SORT_DESC };
struct sort_criterion {
OPT_TIMESTAMP,
OPT_SORT,
OPT_RSORT,
+ OPT_UNIXCTL,
DAEMON_OPTION_ENUMS,
OFP_VERSION_OPTION_ENUMS,
VLOG_OPTION_ENUMS
{"timestamp", no_argument, NULL, OPT_TIMESTAMP},
{"sort", optional_argument, NULL, OPT_SORT},
{"rsort", optional_argument, NULL, OPT_RSORT},
+ {"unixctl", required_argument, NULL, OPT_UNIXCTL},
{"help", no_argument, NULL, 'h'},
DAEMON_LONG_OPTIONS,
OFP_VERSION_LONG_OPTIONS,
uint32_t versions;
enum ofputil_protocol version_protocols;
+ /* For now, ovs-ofctl only enables OpenFlow 1.0 by default. This is
+ * because ovs-ofctl implements command such as "add-flow" as raw OpenFlow
+ * requests, but those requests have subtly different semantics in
+ * different OpenFlow versions. For example:
+ *
+ * - In OpenFlow 1.0, a "mod-flow" operation that does not find any
+ * existing flow to modify adds a new flow.
+ *
+ * - In OpenFlow 1.1, a "mod-flow" operation that does not find any
+ * existing flow to modify adds a new flow, but only if the mod-flow
+ * did not match on the flow cookie.
+ *
+ * - In OpenFlow 1.2 and a later, a "mod-flow" operation never adds a
+ * new flow.
+ */
+ set_allowed_ofp_versions("OpenFlow10");
+
for (;;) {
unsigned long int timeout;
int c;
add_sort_criterion(SORT_DESC, optarg);
break;
+ case OPT_UNIXCTL:
+ unixctl_path = optarg;
+ break;
+
DAEMON_OPTION_HANDLERS
OFP_VERSION_OPTION_HANDLERS
VLOG_OPTION_HANDLERS
" show SWITCH show OpenFlow information\n"
" dump-desc SWITCH print switch description\n"
" dump-tables SWITCH print table stats\n"
+ " dump-table-features SWITCH print table features\n"
" mod-port SWITCH IFACE ACT modify port behavior\n"
" mod-table SWITCH MOD modify flow table behavior\n"
" 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-ports-desc SWITCH [PORT] 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"
" mod-group SWITCH GROUP modify specific group\n"
" del-groups SWITCH [GROUP] delete matching GROUPs\n"
" dump-group-features SWITCH print group features\n"
- " dump-groups SWITCH print group description\n"
+ " dump-groups SWITCH [GROUP] print group description\n"
" dump-group-stats SWITCH [GROUP] print group statistics\n"
" queue-get-config SWITCH PORT print queue information for port\n"
" add-meter SWITCH METER add meter described by METER\n"
" -t, --timeout=SECS give up after SECS seconds\n"
" --sort[=field] sort in ascending order\n"
" --rsort[=field] sort in descending order\n"
+ " --unixctl=SOCKET set control socket name\n"
" -h, --help display this help message\n"
" -V, --version display version information\n");
exit(EXIT_SUCCESS);
ofpmsg_update_length(request);
run(vconn_transact(vconn, request, &reply), "talking to %s",
vconn_get_name(vconn));
- ofp_print(stdout, reply->data, reply->size, verbosity + 1);
+ ofp_print(stdout, ofpbuf_data(reply), ofpbuf_size(reply), verbosity + 1);
ofpbuf_delete(reply);
}
static void
dump_stats_transaction(struct vconn *vconn, struct ofpbuf *request)
{
- const struct ofp_header *request_oh = request->data;
+ const struct ofp_header *request_oh = ofpbuf_data(request);
ovs_be32 send_xid = request_oh->xid;
enum ofpraw request_raw;
enum ofpraw reply_raw;
bool done = false;
- ofpraw_decode_partial(&request_raw, request->data, request->size);
+ ofpraw_decode_partial(&request_raw, ofpbuf_data(request), ofpbuf_size(request));
reply_raw = ofpraw_stats_request_to_reply(request_raw,
request_oh->version);
struct ofpbuf *reply;
run(vconn_recv_block(vconn, &reply), "OpenFlow packet receive failed");
- recv_xid = ((struct ofp_header *) reply->data)->xid;
+ recv_xid = ((struct ofp_header *) ofpbuf_data(reply))->xid;
if (send_xid == recv_xid) {
enum ofpraw raw;
- ofp_print(stdout, reply->data, reply->size, verbosity + 1);
+ ofp_print(stdout, ofpbuf_data(reply), ofpbuf_size(reply), verbosity + 1);
- ofpraw_decode(&raw, reply->data);
+ ofpraw_decode(&raw, ofpbuf_data(reply));
if (ofptype_from_ofpraw(raw) == OFPTYPE_ERROR) {
done = true;
} else if (raw == reply_raw) {
- done = !ofpmp_more(reply->data);
+ done = !ofpmp_more(ofpbuf_data(reply));
} else {
ovs_fatal(0, "received bad reply: %s",
- ofp_to_string(reply->data, reply->size,
+ ofp_to_string(ofpbuf_data(reply), ofpbuf_size(reply),
verbosity + 1));
}
} else {
run(vconn_transact_multiple_noreply(vconn, requests, &reply),
"talking to %s", vconn_get_name(vconn));
if (reply) {
- ofp_print(stderr, reply->data, reply->size, verbosity + 2);
+ ofp_print(stderr, ofpbuf_data(reply), ofpbuf_size(reply), verbosity + 2);
exit(1);
}
ofpbuf_delete(reply);
ofctl_show(int argc OVS_UNUSED, char *argv[])
{
const char *vconn_name = argv[1];
+ enum ofp_version version;
struct vconn *vconn;
struct ofpbuf *request;
struct ofpbuf *reply;
- bool trunc;
+ bool has_ports;
open_vconn(vconn_name, &vconn);
- request = ofpraw_alloc(OFPRAW_OFPT_FEATURES_REQUEST,
- vconn_get_version(vconn), 0);
+ version = vconn_get_version(vconn);
+ request = ofpraw_alloc(OFPRAW_OFPT_FEATURES_REQUEST, version, 0);
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);
-
+ has_ports = ofputil_switch_features_has_ports(reply);
+ ofp_print(stdout, ofpbuf_data(reply), ofpbuf_size(reply), verbosity + 1);
ofpbuf_delete(reply);
- 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,
- OFPRAW_OFPST_PORT_DESC_REQUEST);
+ if (!has_ports) {
+ request = ofputil_encode_port_desc_stats_request(version, OFPP_ANY);
+ dump_stats_transaction(vconn, request);
}
dump_trivial_transaction(vconn_name, OFPRAW_OFPT_GET_CONFIG_REQUEST);
vconn_close(vconn);
dump_trivial_stats_transaction(argv[1], OFPRAW_OFPST_TABLE_REQUEST);
}
+static void
+ofctl_dump_table_features(int argc OVS_UNUSED, char *argv[])
+{
+ struct ofpbuf *request;
+ struct vconn *vconn;
+
+ open_vconn(argv[1], &vconn);
+ request = ofputil_encode_table_features_request(vconn_get_version(vconn));
+ if (request) {
+ dump_stats_transaction(vconn, request);
+ }
+
+ vconn_close(vconn);
+}
+
+static bool fetch_port_by_stats(struct vconn *,
+ const char *port_name, ofp_port_t port_no,
+ struct ofputil_phy_port *);
+
+/* Uses OFPT_FEATURES_REQUEST to attempt to fetch information about the port
+ * named 'port_name' or numbered 'port_no' into '*pp'. Returns true if
+ * successful, false on failure.
+ *
+ * This is only appropriate for OpenFlow 1.0, 1.1, and 1.2, which include a
+ * list of ports in OFPT_FEATURES_REPLY. */
static bool
-fetch_port_by_features(const char *vconn_name,
+fetch_port_by_features(struct vconn *vconn,
const char *port_name, ofp_port_t port_no,
- struct ofputil_phy_port *pp, bool *trunc)
+ struct ofputil_phy_port *pp)
{
struct ofputil_switch_features features;
const struct ofp_header *oh;
struct ofpbuf *request, *reply;
- struct vconn *vconn;
enum ofperr error;
enum ofptype type;
struct ofpbuf b;
bool found = false;
/* Fetch the switch's ofp_switch_features. */
- open_vconn(vconn_name, &vconn);
request = ofpraw_alloc(OFPRAW_OFPT_FEATURES_REQUEST,
vconn_get_version(vconn), 0);
- run(vconn_transact(vconn, request, &reply), "talking to %s", vconn_name);
- vconn_close(vconn);
+ run(vconn_transact(vconn, request, &reply),
+ "talking to %s", vconn_get_name(vconn));
- oh = reply->data;
- if (ofptype_decode(&type, reply->data)
+ oh = ofpbuf_data(reply);
+ if (ofptype_decode(&type, ofpbuf_data(reply))
|| type != OFPTYPE_FEATURES_REPLY) {
- ovs_fatal(0, "%s: received bad features reply", vconn_name);
+ ovs_fatal(0, "%s: received bad features reply", vconn_get_name(vconn));
}
-
- *trunc = false;
- if (ofputil_switch_features_ports_trunc(reply)) {
- *trunc = true;
- goto exit;
+ if (!ofputil_switch_features_has_ports(reply)) {
+ /* The switch features reply does not contain a complete list of ports.
+ * Probably, there are more ports than will fit into a single 64 kB
+ * OpenFlow message. Use OFPST_PORT_DESC to get a complete list of
+ * ports. */
+ ofpbuf_delete(reply);
+ return fetch_port_by_stats(vconn, port_name, port_no, pp);
}
error = ofputil_decode_switch_features(oh, &features, &b);
if (error) {
ovs_fatal(0, "%s: failed to decode features reply (%s)",
- vconn_name, ofperr_to_string(error));
+ vconn_get_name(vconn), ofperr_to_string(error));
}
while (!ofputil_pull_phy_port(oh->version, &b, pp)) {
? port_no == pp->port_no
: !strcmp(pp->name, port_name)) {
found = true;
- goto exit;
+ break;
}
}
-
-exit:
ofpbuf_delete(reply);
return found;
}
+/* Uses a OFPST_PORT_DESC request to attempt to fetch information about the
+ * port named 'port_name' or numbered 'port_no' into '*pp'. Returns true if
+ * successful, false on failure.
+ *
+ * This is most appropriate for OpenFlow 1.3 and later. Open vSwitch 1.7 and
+ * later also implements OFPST_PORT_DESC, as an extension, for OpenFlow 1.0,
+ * 1.1, and 1.2, so this can be used as a fallback in those versions when there
+ * are too many ports than fit in an OFPT_FEATURES_REPLY. */
static bool
-fetch_port_by_stats(const char *vconn_name,
+fetch_port_by_stats(struct vconn *vconn,
const char *port_name, ofp_port_t port_no,
struct ofputil_phy_port *pp)
{
struct ofpbuf *request;
- struct vconn *vconn;
ovs_be32 send_xid;
bool done = false;
bool found = false;
- request = ofpraw_alloc(OFPRAW_OFPST_PORT_DESC_REQUEST, OFP10_VERSION, 0);
- send_xid = ((struct ofp_header *) request->data)->xid;
+ request = ofputil_encode_port_desc_stats_request(vconn_get_version(vconn),
+ port_no);
+ send_xid = ((struct ofp_header *) ofpbuf_data(request))->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;
+ recv_xid = ((struct ofp_header *) ofpbuf_data(reply))->xid;
if (send_xid == recv_xid) {
- struct ofp_header *oh = reply->data;
+ struct ofp_header *oh = ofpbuf_data(reply);
enum ofptype type;
struct ofpbuf b;
uint16_t flags;
if (ofptype_pull(&type, &b)
|| type != OFPTYPE_PORT_DESC_STATS_REPLY) {
ovs_fatal(0, "received bad reply: %s",
- ofp_to_string(reply->data, reply->size,
+ ofp_to_string(ofpbuf_data(reply), ofpbuf_size(reply),
verbosity + 1));
}
}
ofpbuf_delete(reply);
}
- vconn_close(vconn);
return found;
}
fetch_ofputil_phy_port(const char *vconn_name, const char *port_name,
struct ofputil_phy_port *pp)
{
+ struct vconn *vconn;
ofp_port_t port_no;
bool found;
- bool trunc;
/* Try to interpret the argument as a port number. */
if (!str_to_ofp(port_name, &port_no)) {
port_no = OFPP_NONE;
}
- /* 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);
- }
+ /* OpenFlow 1.0, 1.1, and 1.2 put the list of ports in the
+ * OFPT_FEATURES_REPLY message. OpenFlow 1.3 and later versions put it
+ * into the OFPST_PORT_DESC reply. Try it the correct way. */
+ open_vconn(vconn_name, &vconn);
+ found = (vconn_get_version(vconn) < OFP13_VERSION
+ ? fetch_port_by_features(vconn, port_name, port_no, pp)
+ : fetch_port_by_stats(vconn, port_name, port_no, pp));
+ vconn_close(vconn);
if (!found) {
ovs_fatal(0, "%s: couldn't find port `%s'", vconn_name, port_name);
run(vconn_transact_noreply(vconn, request, &reply),
"talking to %s", vconn_get_name(vconn));
if (reply) {
- char *s = ofp_to_string(reply->data, reply->size, 2);
+ char *s = ofp_to_string(ofpbuf_data(reply), ofpbuf_size(reply), 2);
VLOG_DBG("%s: failed to set protocol, switch replied: %s",
vconn_get_name(vconn), s);
free(s);
size_t i;
vconn = prepare_dump_flows(argc, argv, false, &request);
- send_xid = ((struct ofp_header *) request->data)->xid;
+ send_xid = ((struct ofp_header *) ofpbuf_data(request))->xid;
send_openflow_buffer(vconn, request);
fses = NULL;
ds_destroy(&s);
for (i = 0; i < n_fses; i++) {
- free(fses[i].ofpacts);
+ free(CONST_CAST(struct ofpact *, fses[i].ofpacts));
}
free(fses);
struct ofputil_flow_mod *fm = &fms[i];
transact_noreply(vconn, ofputil_encode_flow_mod(fm, protocol));
- free(fm->ofpacts);
+ free(CONST_CAST(struct ofpact *, fm->ofpacts));
}
vconn_close(vconn);
}
return "Trailing garbage in hex data";
}
- if (msg->size < sizeof(struct ofp_header)) {
+ if (ofpbuf_size(msg) < sizeof(struct ofp_header)) {
ofpbuf_delete(msg);
return "Message too short for OpenFlow";
}
- oh = msg->data;
- if (msg->size != ntohs(oh->length)) {
+ oh = ofpbuf_data(msg);
+ if (ofpbuf_size(msg) != ntohs(oh->length)) {
ofpbuf_delete(msg);
return "Message size does not match length in OpenFlow header";
}
}
fprintf(stderr, "send: ");
- ofp_print(stderr, msg->data, msg->size, verbosity);
+ ofp_print(stderr, ofpbuf_data(msg), ofpbuf_size(msg), verbosity);
error = vconn_send_block(vconn, msg);
if (error) {
daemon_save_fd(STDERR_FILENO);
daemonize_start();
- error = unixctl_server_create(NULL, &server);
+ error = unixctl_server_create(unixctl_path, &server);
if (error) {
ovs_fatal(error, "failed to create unixctl server");
}
free(s);
}
- ofptype_decode(&type, b->data);
- ofp_print(stderr, b->data, b->size, verbosity + 2);
+ ofptype_decode(&type, ofpbuf_data(b));
+ ofp_print(stderr, ofpbuf_data(b), ofpbuf_size(b), verbosity + 2);
switch ((int) type) {
case OFPTYPE_BARRIER_REPLY:
if (reply_to_echo_requests) {
struct ofpbuf *reply;
- reply = make_echo_reply(b->data);
+ reply = make_echo_reply(ofpbuf_data(b));
retval = vconn_send_block(vconn, reply);
if (retval) {
ovs_fatal(retval, "failed to send echo reply");
run(vconn_transact_noreply(vconn, spif, &reply),
"talking to %s", vconn_get_name(vconn));
if (reply) {
- char *s = ofp_to_string(reply->data, reply->size, 2);
+ char *s = ofp_to_string(ofpbuf_data(reply), ofpbuf_size(reply), 2);
VLOG_DBG("%s: failed to set packet in format to nxm, controller"
" replied: %s. Falling back to the switch default.",
vconn_get_name(vconn), s);
case OFP11_VERSION:
case OFP12_VERSION:
case OFP13_VERSION:
+ case OFP14_VERSION:
+ case OFP15_VERSION:
break;
default:
OVS_NOT_REACHED();
static void
ofctl_dump_ports_desc(int argc OVS_UNUSED, char *argv[])
{
- dump_trivial_stats_transaction(argv[1], OFPRAW_OFPST_PORT_DESC_REQUEST);
+ struct ofpbuf *request;
+ struct vconn *vconn;
+ ofp_port_t port;
+
+ open_vconn(argv[1], &vconn);
+ port = argc > 2 ? str_to_port_no(argv[1], argv[2]) : OFPP_ANY;
+ request = ofputil_encode_port_desc_stats_request(vconn_get_version(vconn),
+ port);
+ dump_stats_transaction(vconn, request);
+ vconn_close(vconn);
}
static void
open_vconn(argv[1], &vconn);
request = make_echo_request(vconn_get_version(vconn));
run(vconn_transact(vconn, request, &reply), "talking to %s", argv[1]);
- if (reply->size != sizeof(struct ofp_header)) {
+ if (ofpbuf_size(reply) != sizeof(struct ofp_header)) {
ovs_fatal(0, "reply does not match request");
}
ofpbuf_delete(reply);
po.buffer_id = UINT32_MAX;
po.in_port = str_to_port_no(argv[1], argv[2]);
- po.ofpacts = ofpacts.data;
- po.ofpacts_len = ofpacts.size;
+ po.ofpacts = ofpbuf_data(&ofpacts);
+ po.ofpacts_len = ofpbuf_size(&ofpacts);
protocol = open_vconn(argv[1], &vconn);
for (i = 4; i < argc; i++) {
ovs_fatal(0, "%s", error_msg);
}
- po.packet = packet->data;
- po.packet_len = packet->size;
+ po.packet = ofpbuf_data(packet);
+ po.packet_len = ofpbuf_size(packet);
opo = ofputil_encode_packet_out(&po, protocol);
transact_noreply(vconn, opo);
ofpbuf_delete(packet);
ovs_fatal(0, "%s: unexpected end of file mid-message", filename);
}
- ofp_print(stdout, b.data, b.size, verbosity + 2);
+ ofp_print(stdout, ofpbuf_data(&b), ofpbuf_size(&b), verbosity + 2);
}
ofpbuf_uninit(&b);
is_openflow_port(flow.tp_dst, argv + 2))) {
struct ofpbuf *payload = tcp_reader_run(reader, &flow, packet);
if (payload) {
- while (payload->size >= sizeof(struct ofp_header)) {
+ while (ofpbuf_size(payload) >= sizeof(struct ofp_header)) {
const struct ofp_header *oh;
+ void *data = ofpbuf_data(payload);
int length;
/* Align OpenFlow on 8-byte boundary for safe access. */
- ofpbuf_shift(payload, -((intptr_t) payload->data & 7));
+ ofpbuf_shift(payload, -((intptr_t) data & 7));
- oh = payload->data;
+ oh = ofpbuf_data(payload);
length = ntohs(oh->length);
- if (payload->size < length) {
+ if (ofpbuf_size(payload) < length) {
break;
}
printf(IP_FMT".%"PRIu16" > "IP_FMT".%"PRIu16":\n",
IP_ARGS(flow.nw_src), ntohs(flow.tp_src),
IP_ARGS(flow.nw_dst), ntohs(flow.tp_dst));
- ofp_print(stdout, payload->data, length, verbosity + 1);
+ ofp_print(stdout, ofpbuf_data(payload), length, verbosity + 1);
ofpbuf_pull(payload, length);
}
}
run(vconn_transact(vconn, ofpbuf_clone(request), &reply), "transact");
xgettimeofday(&end);
- rpy_hdr = reply->data;
+ rpy_hdr = ofpbuf_data(reply);
if (ofptype_pull(&type, reply)
|| type != OFPTYPE_ECHO_REPLY
- || reply->size != payload
- || memcmp(request->l3, reply->l3, payload)) {
+ || ofpbuf_size(reply) != payload
+ || memcmp(ofpbuf_l3(request), ofpbuf_l3(reply), payload)) {
printf("Reply does not match request. Request:\n");
- ofp_print(stdout, request, request->size, verbosity + 2);
+ ofp_print(stdout, request, ofpbuf_size(request), verbosity + 2);
printf("Reply:\n");
- ofp_print(stdout, reply, reply->size, verbosity + 2);
+ ofp_print(stdout, reply, ofpbuf_size(reply), verbosity + 2);
}
- printf("%"PRIuSIZE" bytes from %s: xid=%08"PRIx32" time=%.1f ms\n",
- reply->size, argv[1], ntohl(rpy_hdr->xid),
+ printf("%"PRIu32" bytes from %s: xid=%08"PRIx32" time=%.1f ms\n",
+ ofpbuf_size(reply), argv[1], ntohl(rpy_hdr->xid),
(1000*(double)(end.tv_sec - start.tv_sec))
+ (.001*(end.tv_usec - start.tv_usec)));
ofpbuf_delete(request);
{
struct ofpbuf *request;
struct vconn *vconn;
+ uint32_t group_id;
open_vconn(argv[1], &vconn);
- request = ofputil_encode_group_desc_request(vconn_get_version(vconn));
+ if (argc < 3 || !ofputil_group_from_string(argv[2], &group_id)) {
+ group_id = OFPG11_ALL;
+ }
+
+ request = ofputil_encode_group_desc_request(vconn_get_version(vconn),
+ group_id);
if (request) {
dump_stats_transaction(vconn, request);
}
fte_version_free(struct fte_version *version)
{
if (version) {
- free(version->ofpacts);
+ free(CONST_CAST(struct ofpact *, version->ofpacts));
free(version);
}
}
do {
run(vconn_recv_block(vconn, &reply),
"OpenFlow packet receive failed");
- } while (((struct ofp_header *) reply->data)->xid != send_xid);
+ } while (((struct ofp_header *) ofpbuf_data(reply))->xid != send_xid);
- error = ofptype_decode(&type, reply->data);
+ error = ofptype_decode(&type, ofpbuf_data(reply));
if (error || type != OFPTYPE_FLOW_STATS_REPLY) {
ovs_fatal(0, "received bad reply: %s",
- ofp_to_string(reply->data, reply->size,
+ ofp_to_string(ofpbuf_data(reply), ofpbuf_size(reply),
verbosity + 1));
}
}
return true;
case EOF:
- more = ofpmp_more(reply->l2);
+ more = ofpmp_more(reply->frame);
ofpbuf_delete(reply);
reply = NULL;
if (!more) {
fsr.table_id = 0xff;
fsr.cookie = fsr.cookie_mask = htonll(0);
request = ofputil_encode_flow_stats_request(&fsr, protocol);
- send_xid = ((struct ofp_header *) request->data)->xid;
+ send_xid = ((struct ofp_header *) ofpbuf_data(request))->xid;
send_openflow_buffer(vconn, request);
reply = NULL;
struct ofpbuf *msg;
msg = ofputil_encode_flow_mod(fm, protocol);
- ofp_print(stdout, msg->data, msg->size, verbosity);
+ ofp_print(stdout, ofpbuf_data(msg), ofpbuf_size(msg), verbosity);
ofpbuf_delete(msg);
- free(fm->ofpacts);
+ free(CONST_CAST(struct ofpact *, fm->ofpacts));
}
}
}
static void
-ofctl_parse_nxm__(bool oxm)
+ofctl_parse_nxm__(bool oxm, enum ofp_version version)
{
struct ds in;
ofpbuf_uninit(&nx_match);
ofpbuf_init(&nx_match, 0);
if (oxm) {
- match_len = oxm_put_match(&nx_match, &match);
+ match_len = oxm_put_match(&nx_match, &match, version);
out = oxm_match_to_string(&nx_match, match_len);
} else {
match_len = nx_put_match(&nx_match, &match,
cookie, cookie_mask);
- out = nx_match_to_string(nx_match.data, match_len);
+ out = nx_match_to_string(ofpbuf_data(&nx_match), match_len);
}
puts(out);
static void
ofctl_parse_nxm(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
{
- return ofctl_parse_nxm__(false);
+ return ofctl_parse_nxm__(false, 0);
}
-/* "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. */
+/* "parse-oxm VERSION": 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. VERSION must specify an OpenFlow version,
+ * e.g. "OpenFlow12". */
static void
-ofctl_parse_oxm(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+ofctl_parse_oxm(int argc OVS_UNUSED, char *argv[])
{
- return ofctl_parse_nxm__(true);
+ enum ofp_version version = ofputil_version_from_string(argv[1]);
+ if (version < OFP12_VERSION) {
+ ovs_fatal(0, "%s: not a valid version for OXM", argv[1]);
+ }
+
+ return ofctl_parse_nxm__(true, version);
}
static void
/* Convert to ofpacts. */
ofpbuf_init(&ofpacts, 0);
- size = of10_in.size;
- error = ofpacts_pull_openflow_actions(&of10_in, of10_in.size,
+ size = ofpbuf_size(&of10_in);
+ error = ofpacts_pull_openflow_actions(&of10_in, ofpbuf_size(&of10_in),
OFP10_VERSION, &ofpacts);
if (error) {
printf("bad OF1.1 actions: %s\n\n", ofperr_get_name(error));
/* Print cls_rule. */
ds_init(&s);
ds_put_cstr(&s, "actions=");
- ofpacts_format(ofpacts.data, ofpacts.size, &s);
+ ofpacts_format(ofpbuf_data(&ofpacts), ofpbuf_size(&ofpacts), &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_openflow_actions(ofpacts.data, ofpacts.size, &of10_out,
+ ofpacts_put_openflow_actions(ofpbuf_data(&ofpacts), ofpbuf_size(&ofpacts), &of10_out,
OFP10_VERSION);
- print_differences("", of10_in.data, of10_in.size,
- of10_out.data, of10_out.size);
+ print_differences("", ofpbuf_data(&of10_in), ofpbuf_size(&of10_in),
+ ofpbuf_data(&of10_out), ofpbuf_size(&of10_out));
putchar('\n');
ofpbuf_uninit(&ofpacts);
if (ofpbuf_put_hex(&match_expout, ds_cstr(&expout), NULL)[0] != '\0') {
ovs_fatal(0, "Trailing garbage in hex data");
}
- if (match_expout.size != sizeof(struct ofp10_match)) {
- ovs_fatal(0, "Input is %"PRIuSIZE" bytes, expected %"PRIuSIZE,
- match_expout.size, sizeof(struct ofp10_match));
+ if (ofpbuf_size(&match_expout) != sizeof(struct ofp10_match)) {
+ ovs_fatal(0, "Input is %"PRIu32" bytes, expected %"PRIuSIZE,
+ ofpbuf_size(&match_expout), sizeof(struct ofp10_match));
}
/* Parse hex bytes for input. */
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 ofp10_match)) {
- ovs_fatal(0, "Input is %"PRIuSIZE" bytes, expected %"PRIuSIZE,
- match_in.size, sizeof(struct ofp10_match));
+ if (ofpbuf_size(&match_in) != sizeof(struct ofp10_match)) {
+ ovs_fatal(0, "Input is %"PRIu32" bytes, expected %"PRIuSIZE,
+ ofpbuf_size(&match_in), sizeof(struct ofp10_match));
}
/* Convert to cls_rule and print. */
- ofputil_match_from_ofp10_match(match_in.data, &match);
+ ofputil_match_from_ofp10_match(ofpbuf_data(&match_in), &match);
match_print(&match);
/* Convert back to ofp10_match and print differences from input. */
ofputil_match_to_ofp10_match(&match, &match_out);
- print_differences("", match_expout.data, match_expout.size,
+ print_differences("", ofpbuf_data(&match_expout), ofpbuf_size(&match_expout),
&match_out, sizeof match_out);
/* Normalize, then convert and compare again. */
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 %"PRIuSIZE" bytes, expected %"PRIuSIZE,
- match_in.size, sizeof(struct ofp11_match));
+ if (ofpbuf_size(&match_in) != sizeof(struct ofp11_match)) {
+ ovs_fatal(0, "Input is %"PRIu32" bytes, expected %"PRIuSIZE,
+ ofpbuf_size(&match_in), sizeof(struct ofp11_match));
}
/* Convert to match. */
- error = ofputil_match_from_ofp11_match(match_in.data, &match);
+ error = ofputil_match_from_ofp11_match(ofpbuf_data(&match_in), &match);
if (error) {
printf("bad ofp11_match: %s\n\n", ofperr_get_name(error));
ofpbuf_uninit(&match_in);
/* Convert back to ofp11_match and print differences from input. */
ofputil_match_to_ofp11_match(&match, &match_out);
- print_differences("", match_in.data, match_in.size,
+ print_differences("", ofpbuf_data(&match_in), ofpbuf_size(&match_in),
&match_out, sizeof match_out);
putchar('\n');
/* Convert to ofpacts. */
ofpbuf_init(&ofpacts, 0);
- size = of11_in.size;
- error = ofpacts_pull_openflow_actions(&of11_in, of11_in.size,
+ size = ofpbuf_size(&of11_in);
+ error = ofpacts_pull_openflow_actions(&of11_in, ofpbuf_size(&of11_in),
OFP11_VERSION, &ofpacts);
if (error) {
printf("bad OF1.1 actions: %s\n\n", ofperr_get_name(error));
/* Print cls_rule. */
ds_init(&s);
ds_put_cstr(&s, "actions=");
- ofpacts_format(ofpacts.data, ofpacts.size, &s);
+ ofpacts_format(ofpbuf_data(&ofpacts), ofpbuf_size(&ofpacts), &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_openflow_actions(ofpacts.data, ofpacts.size, &of11_out,
+ ofpacts_put_openflow_actions(ofpbuf_data(&ofpacts), ofpbuf_size(&ofpacts), &of11_out,
OFP11_VERSION);
- print_differences("", of11_in.data, of11_in.size,
- of11_out.data, of11_out.size);
+ print_differences("", ofpbuf_data(&of11_in), ofpbuf_size(&of11_in),
+ ofpbuf_data(&of11_out), ofpbuf_size(&of11_out));
putchar('\n');
ofpbuf_uninit(&ofpacts);
/* Convert to ofpacts. */
ofpbuf_init(&ofpacts, 0);
- size = of11_in.size;
- error = ofpacts_pull_openflow_instructions(&of11_in, of11_in.size,
+ size = ofpbuf_size(&of11_in);
+ error = ofpacts_pull_openflow_instructions(&of11_in, ofpbuf_size(&of11_in),
OFP11_VERSION, &ofpacts);
if (!error) {
/* Verify actions, enforce consistency. */
struct flow flow;
memset(&flow, 0, sizeof flow);
- error = ofpacts_check_consistency(ofpacts.data, ofpacts.size,
+ error = ofpacts_check_consistency(ofpbuf_data(&ofpacts), ofpbuf_size(&ofpacts),
&flow, OFPP_MAX,
table_id ? atoi(table_id) : 0,
255, OFPUTIL_P_OF11_STD);
/* Print cls_rule. */
ds_init(&s);
ds_put_cstr(&s, "actions=");
- ofpacts_format(ofpacts.data, ofpacts.size, &s);
+ ofpacts_format(ofpbuf_data(&ofpacts), ofpbuf_size(&ofpacts), &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_openflow_instructions(ofpacts.data, ofpacts.size,
+ ofpacts_put_openflow_instructions(ofpbuf_data(&ofpacts), ofpbuf_size(&ofpacts),
&of11_out, OFP13_VERSION);
- print_differences("", of11_in.data, of11_in.size,
- of11_out.data, of11_out.size);
+ print_differences("", ofpbuf_data(&of11_in), ofpbuf_size(&of11_in),
+ ofpbuf_data(&of11_out), ofpbuf_size(&of11_out));
putchar('\n');
ofpbuf_uninit(&ofpacts);
/* Convert to and from NXM. */
ofpbuf_init(&nxm, 0);
nxm_match_len = nx_put_match(&nxm, &match, htonll(0), htonll(0));
- nxm_s = nx_match_to_string(nxm.data, nxm_match_len);
+ nxm_s = nx_match_to_string(ofpbuf_data(&nxm), nxm_match_len);
error = nx_pull_match(&nxm, nxm_match_len, &nxm_match, NULL, NULL);
printf("NXM: %s -> ", nxm_s);
if (error) {
/* Convert to and from OXM. */
ofpbuf_init(&nxm, 0);
- nxm_match_len = oxm_put_match(&nxm, &match);
+ nxm_match_len = oxm_put_match(&nxm, &match, OFP12_VERSION);
nxm_s = oxm_match_to_string(&nxm, nxm_match_len);
error = oxm_pull_match(&nxm, &nxm_match);
printf("OXM: %s -> ", nxm_s);
if (ofpbuf_put_hex(&request, argv[2], NULL)[0] != '\0') {
ovs_fatal(0, "Trailing garbage in hex data");
}
- if (request.size < sizeof(struct ofp_header)) {
+ if (ofpbuf_size(&request) < sizeof(struct ofp_header)) {
ovs_fatal(0, "Request too short");
}
- oh = request.data;
- if (request.size != ntohs(oh->length)) {
+ oh = ofpbuf_data(&request);
+ if (ofpbuf_size(&request) != ntohs(oh->length)) {
ovs_fatal(0, "Request size inconsistent");
}
- reply = ofperr_encode_reply(error, request.data);
+ reply = ofperr_encode_reply(error, ofpbuf_data(&request));
ofpbuf_uninit(&request);
- ovs_hex_dump(stdout, reply->data, reply->size, 0, false);
+ ovs_hex_dump(stdout, ofpbuf_data(reply), ofpbuf_size(reply), 0, false);
ofpbuf_delete(reply);
}
if (ofpbuf_put_hex(&packet, argv[1], NULL)[0] != '\0') {
ovs_fatal(0, "trailing garbage following hex bytes");
}
- ofp_print(stdout, packet.data, packet.size, argc > 2 ? atoi(argv[2]) : 2);
+ ofp_print(stdout, ofpbuf_data(&packet), ofpbuf_size(&packet), argc > 2 ? atoi(argv[2]) : 2);
ofpbuf_uninit(&packet);
}
struct ofpbuf *hello;
hello = ofputil_encode_hello(bitmap);
- ovs_hex_dump(stdout, hello->data, hello->size, 0, false);
- ofp_print(stdout, hello->data, hello->size, verbosity);
+ ovs_hex_dump(stdout, ofpbuf_data(hello), ofpbuf_size(hello), 0, false);
+ ofp_print(stdout, ofpbuf_data(hello), ofpbuf_size(hello), verbosity);
ofpbuf_delete(hello);
}
{ "snoop", 1, 1, ofctl_snoop },
{ "dump-desc", 1, 1, ofctl_dump_desc },
{ "dump-tables", 1, 1, ofctl_dump_tables },
+ { "dump-table-features", 1, 1, ofctl_dump_table_features },
{ "dump-flows", 1, 2, ofctl_dump_flows },
{ "dump-aggregate", 1, 2, ofctl_dump_aggregate },
{ "queue-stats", 1, 3, ofctl_queue_stats },
{ "meter-features", 1, 1, ofctl_meter_features },
{ "packet-out", 4, INT_MAX, ofctl_packet_out },
{ "dump-ports", 1, 2, ofctl_dump_ports },
- { "dump-ports-desc", 1, 1, ofctl_dump_ports_desc },
+ { "dump-ports-desc", 1, 2, ofctl_dump_ports_desc },
{ "mod-port", 3, 3, ofctl_mod_port },
{ "mod-table", 3, 3, ofctl_mod_table },
{ "get-frags", 1, 1, ofctl_get_frags },
{ "add-groups", 1, 2, ofctl_add_groups },
{ "mod-group", 1, 2, ofctl_mod_group },
{ "del-groups", 1, 2, ofctl_del_groups },
- { "dump-groups", 1, 1, ofctl_dump_group_desc },
+ { "dump-groups", 1, 2, ofctl_dump_group_desc },
{ "dump-group-stats", 1, 2, ofctl_dump_group_stats },
{ "dump-group-features", 1, 1, ofctl_dump_group_features },
{ "help", 0, INT_MAX, ofctl_help },
{ "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-oxm", 1, 1, ofctl_parse_oxm },
{ "parse-ofp10-actions", 0, 0, ofctl_parse_ofp10_actions },
{ "parse-ofp10-match", 0, 0, ofctl_parse_ofp10_match },
{ "parse-ofp11-match", 0, 0, ofctl_parse_ofp11_match },