/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "ofproto/ofproto.h"
#include "openflow/nicira-ext.h"
#include "openflow/openflow.h"
+#include "dp-packet.h"
#include "packets.h"
#include "pcap-file.h"
#include "poll-loop.h"
#include "timeval.h"
#include "unixctl.h"
#include "util.h"
-#include "vconn.h"
-#include "vlog.h"
+#include "openvswitch/vconn.h"
+#include "openvswitch/vlog.h"
#include "meta-flow.h"
#include "sort.h"
static const struct command *get_all_commands(void);
-static void usage(void) NO_RETURN;
+OVS_NO_RETURN static void usage(void);
static void parse_options(int argc, char *argv[]);
static bool recv_flow_stats_reply(struct vconn *, ovs_be32 send_xid,
{"rsort", optional_argument, NULL, OPT_RSORT},
{"unixctl", required_argument, NULL, OPT_UNIXCTL},
{"help", no_argument, NULL, 'h'},
+ {"option", no_argument, NULL, 'o'},
DAEMON_LONG_OPTIONS,
OFP_VERSION_LONG_OPTIONS,
VLOG_LONG_OPTIONS,
case 'h':
usage();
+ case 'o':
+ print_options(long_options);
+ exit(EXIT_SUCCESS);
+
case OPT_STRICT:
strict = true;
break;
" print packets received from SWITCH\n"
" snoop SWITCH snoop on SWITCH and its controller\n"
" add-group SWITCH GROUP add group described by GROUP\n"
- " add-group SWITCH FILE add group from FILE\n"
+ " add-groups SWITCH FILE add group from FILE\n"
" mod-group SWITCH GROUP modify specific group\n"
" del-groups SWITCH [GROUP] delete matching GROUPs\n"
+ " insert-buckets SWITCH [GROUP] add buckets to GROUP\n"
+ " remove-buckets SWITCH [GROUP] remove buckets from GROUP\n"
" dump-group-features SWITCH print group features\n"
" dump-groups SWITCH [GROUP] print group description\n"
" dump-group-stats SWITCH [GROUP] print group statistics\n"
}
static void run(int retval, const char *message, ...)
- PRINTF_FORMAT(2, 3);
+ OVS_PRINTF_FORMAT(2, 3);
static void
run(int retval, const char *message, ...)
*
* Destroys all of the 'requests'. */
static void
-transact_multiple_noreply(struct vconn *vconn, struct list *requests)
+transact_multiple_noreply(struct vconn *vconn, struct ovs_list *requests)
{
struct ofpbuf *request, *reply;
static void
transact_noreply(struct vconn *vconn, struct ofpbuf *request)
{
- struct list requests;
+ struct ovs_list requests;
list_init(&requests);
list_push_back(&requests, &request->list_node);
int ret;
if (!f) {
- unsigned int a_pri = afs->priority;
- unsigned int b_pri = bfs->priority;
+ int a_pri = afs->priority;
+ int b_pri = bfs->priority;
ret = a_pri < b_pri ? -1 : a_pri > b_pri;
} else {
bool ina, inb;
ofctl_dump_flows(int argc, char *argv[])
{
if (!n_criteria) {
- return ofctl_dump_flows__(argc, argv, false);
+ ofctl_dump_flows__(argc, argv, false);
+ return;
} else {
struct ofputil_flow_stats *fses;
size_t n_fses, allocated_fses;
static void
ofctl_dump_aggregate(int argc, char *argv[])
{
- return ofctl_dump_flows__(argc, argv, true);
+ ofctl_dump_flows__(argc, argv, true);
}
static void
enum ofputil_protocol usable_protocols; /* XXX: Use in proto selection */
ofpbuf_init(&ofpacts, 64);
- error = parse_ofpacts(argv[3], &ofpacts, &usable_protocols);
+ error = ofpacts_parse_actions(argv[3], &ofpacts, &usable_protocols);
if (error) {
ovs_fatal(0, "%s", error);
}
protocol = open_vconn(argv[1], &vconn);
for (i = 4; i < argc; i++) {
- struct ofpbuf *packet, *opo;
+ struct dp_packet *packet;
+ struct ofpbuf *opo;
const char *error_msg;
error_msg = eth_from_hex(argv[i], &packet);
ovs_fatal(0, "%s", error_msg);
}
- po.packet = ofpbuf_data(packet);
- po.packet_len = ofpbuf_size(packet);
+ po.packet = dp_packet_data(packet);
+ po.packet_len = dp_packet_size(packet);
opo = ofputil_encode_packet_out(&po, protocol);
transact_noreply(vconn, opo);
- ofpbuf_delete(packet);
+ dp_packet_delete(packet);
}
vconn_close(vconn);
ofpbuf_uninit(&ofpacts);
reader = tcp_reader_open();
first = true;
for (;;) {
- struct ofpbuf *packet;
+ struct dp_packet *packet;
long long int when;
struct flow flow;
- const struct pkt_metadata md = PKT_METADATA_INITIALIZER(ODPP_NONE);
error = ovs_pcap_read(file, &packet, &when);
if (error) {
break;
}
- flow_extract(packet, &md, &flow);
+ packet->md = PKT_METADATA_INITIALIZER(ODPP_NONE);
+ flow_extract(packet, &flow);
if (flow.dl_type == htons(ETH_TYPE_IP)
&& flow.nw_proto == IPPROTO_TCP
&& (is_openflow_port(flow.tp_src, argv + 2) ||
is_openflow_port(flow.tp_dst, argv + 2))) {
- struct ofpbuf *payload = tcp_reader_run(reader, &flow, packet);
+ struct dp_packet *payload = tcp_reader_run(reader, &flow, packet);
if (payload) {
- while (ofpbuf_size(payload) >= sizeof(struct ofp_header)) {
+ while (dp_packet_size(payload) >= sizeof(struct ofp_header)) {
const struct ofp_header *oh;
- void *data = ofpbuf_data(payload);
+ void *data = dp_packet_data(payload);
int length;
/* Align OpenFlow on 8-byte boundary for safe access. */
- ofpbuf_shift(payload, -((intptr_t) data & 7));
+ dp_packet_shift(payload, -((intptr_t) data & 7));
- oh = ofpbuf_data(payload);
+ oh = dp_packet_data(payload);
length = ntohs(oh->length);
- if (ofpbuf_size(payload) < length) {
+ if (dp_packet_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, ofpbuf_data(payload), length, verbosity + 1);
- ofpbuf_pull(payload, length);
+ ofp_print(stdout, dp_packet_data(payload), length, verbosity + 1);
+ dp_packet_pull(payload, length);
}
}
}
- ofpbuf_delete(packet);
+ dp_packet_delete(packet);
}
tcp_reader_close(reader);
}
static void
ofctl_group_mod__(const char *remote, struct ofputil_group_mod *gms,
- size_t n_gms)
+ size_t n_gms, enum ofputil_protocol usable_protocols)
{
+ enum ofputil_protocol protocol;
struct ofputil_group_mod *gm;
+ enum ofp_version version;
struct ofpbuf *request;
struct vconn *vconn;
size_t i;
- open_vconn(remote, &vconn);
+ protocol = open_vconn_for_flow_mod(remote, &vconn, usable_protocols);
+ version = ofputil_protocol_to_ofp_version(protocol);
for (i = 0; i < n_gms; i++) {
gm = &gms[i];
- request = ofputil_encode_group_mod(vconn_get_version(vconn), gm);
+ request = ofputil_encode_group_mod(version, gm);
if (request) {
transact_noreply(vconn, request);
}
enum ofputil_protocol usable_protocols;
size_t n_gms = 0;
char *error;
+ int i;
error = parse_ofp_group_mod_file(argv[2], command, &gms, &n_gms,
&usable_protocols);
if (error) {
ovs_fatal(0, "%s", error);
}
- ofctl_group_mod__(argv[1], gms, n_gms);
+ ofctl_group_mod__(argv[1], gms, n_gms, usable_protocols);
+ for (i = 0; i < n_gms; i++) {
+ ofputil_bucket_list_destroy(&gms[i].buckets);
+ }
free(gms);
}
if (error) {
ovs_fatal(0, "%s", error);
}
- ofctl_group_mod__(argv[1], &gm, 1);
+ ofctl_group_mod__(argv[1], &gm, 1, usable_protocols);
+ ofputil_bucket_list_destroy(&gm.buckets);
}
}
ofctl_group_mod(argc, argv, OFPGC11_DELETE);
}
+static void
+ofctl_insert_bucket(int argc, char *argv[])
+{
+ ofctl_group_mod(argc, argv, OFPGC15_INSERT_BUCKET);
+}
+
+static void
+ofctl_remove_bucket(int argc, char *argv[])
+{
+ ofctl_group_mod(argc, argv, OFPGC15_REMOVE_BUCKET);
+}
+
static void
ofctl_dump_group_stats(int argc, char *argv[])
{
{
usage();
}
+
+static void
+ofctl_list_commands(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+{
+ print_commands(get_all_commands());
+}
\f
/* replace-flows and diff-flows commands. */
ovs_be64 cookie;
uint16_t idle_timeout;
uint16_t hard_timeout;
+ uint16_t importance;
uint16_t flags;
struct ofpact *ofpacts;
size_t ofpacts_len;
return (a->cookie == b->cookie
&& a->idle_timeout == b->idle_timeout
&& a->hard_timeout == b->hard_timeout
+ && a->importance == b->importance
&& ofpacts_equal(a->ofpacts, a->ofpacts_len,
b->ofpacts, b->ofpacts_len));
}
if (version->hard_timeout != OFP_FLOW_PERMANENT) {
ds_put_format(s, " hard_timeout=%"PRIu16, version->hard_timeout);
}
+ if (version->importance != 0) {
+ ds_put_format(s, " importance=%"PRIu16, version->importance);
+ }
ds_put_cstr(s, " actions=");
ofpacts_format(version->ofpacts, version->ofpacts_len, s);
{
struct fte *fte;
- CLS_FOR_EACH_SAFE (fte, rule, cls) {
+ classifier_defer(cls);
+ CLS_FOR_EACH (fte, rule, cls) {
classifier_remove(cls, &fte->rule);
- fte_free(fte);
+ ovsrcu_postpone(fte_free, fte);
}
classifier_destroy(cls);
}
* Takes ownership of 'version'. */
static void
fte_insert(struct classifier *cls, const struct match *match,
- unsigned int priority, struct fte_version *version, int index)
+ int priority, struct fte_version *version, int index)
{
struct fte *old, *fte;
cls_rule_init(&fte->rule, match, priority);
fte->versions[index] = version;
- old = fte_from_cls_rule(classifier_replace(cls, &fte->rule));
+ old = fte_from_cls_rule(classifier_replace(cls, &fte->rule, NULL, 0));
if (old) {
- fte_version_free(old->versions[index]);
fte->versions[!index] = old->versions[!index];
- cls_rule_destroy(&old->rule);
- free(old);
+ old->versions[!index] = NULL;
+
+ ovsrcu_postpone(fte_free, old);
}
}
ds_init(&s);
usable_protocols = OFPUTIL_P_ANY;
line_number = 0;
+ classifier_defer(cls);
while (!ds_get_preprocessed_line(&s, file, &line_number)) {
struct fte_version *version;
struct ofputil_flow_mod fm;
version->cookie = fm.new_cookie;
version->idle_timeout = fm.idle_timeout;
version->hard_timeout = fm.hard_timeout;
+ version->importance = fm.importance;
version->flags = fm.flags & (OFPUTIL_FF_SEND_FLOW_REM
| OFPUTIL_FF_EMERG);
version->ofpacts = fm.ofpacts;
fte_insert(cls, &fm.match, fm.priority, version, index);
}
+ classifier_publish(cls);
ds_destroy(&s);
if (file != stdin) {
reply = NULL;
ofpbuf_init(&ofpacts, 0);
+ classifier_defer(cls);
while (recv_flow_stats_reply(vconn, send_xid, &reply, &fs, &ofpacts)) {
struct fte_version *version;
version->cookie = fs.cookie;
version->idle_timeout = fs.idle_timeout;
version->hard_timeout = fs.hard_timeout;
+ version->importance = fs.importance;
version->flags = 0;
version->ofpacts_len = fs.ofpacts_len;
version->ofpacts = xmemdup(fs.ofpacts, fs.ofpacts_len);
fte_insert(cls, &fs.match, fs.priority, version, index);
}
+ classifier_publish(cls);
ofpbuf_uninit(&ofpacts);
}
static void
fte_make_flow_mod(const struct fte *fte, int index, uint16_t command,
- enum ofputil_protocol protocol, struct list *packets)
+ enum ofputil_protocol protocol, struct ovs_list *packets)
{
const struct fte_version *version = fte->versions[index];
struct ofputil_flow_mod fm;
fm.command = command;
fm.idle_timeout = version->idle_timeout;
fm.hard_timeout = version->hard_timeout;
+ fm.importance = version->importance;
fm.buffer_id = UINT32_MAX;
fm.out_port = OFPP_ANY;
fm.flags = version->flags;
enum { FILE_IDX = 0, SWITCH_IDX = 1 };
enum ofputil_protocol usable_protocols, protocol;
struct classifier cls;
- struct list requests;
+ struct ovs_list requests;
struct vconn *vconn;
struct fte *fte;
puts(out);
free(out);
+
+ if (verbosity > 0) {
+ ovs_hex_dump(stdout, ofpbuf_data(&nx_match),
+ ofpbuf_size(&nx_match), 0, false);
+ }
} else {
printf("nx_pull_match() returned error %s\n",
ofperr_get_name(error));
static void
ofctl_parse_nxm(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
{
- return ofctl_parse_nxm__(false, 0);
+ ofctl_parse_nxm__(false, 0);
}
/* "parse-oxm VERSION": reads a series of OXM nx_match specifications as
ovs_fatal(0, "%s: not a valid version for OXM", argv[1]);
}
- return ofctl_parse_nxm__(true, version);
+ ofctl_parse_nxm__(true, version);
}
static void
}
}
-/* "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)
+ofctl_parse_actions__(const char *version_s, bool instructions)
{
+ enum ofp_version version;
struct ds in;
+ version = ofputil_version_from_string(version_s);
+ if (!version) {
+ ovs_fatal(0, "%s: not a valid OpenFlow version", version_s);
+ }
+
ds_init(&in);
while (!ds_get_preprocessed_line(&in, stdin, NULL)) {
- struct ofpbuf of10_out;
- struct ofpbuf of10_in;
+ struct ofpbuf of_out;
+ struct ofpbuf of_in;
struct ofpbuf ofpacts;
+ const char *table_id;
+ char *actions;
enum ofperr error;
size_t size;
struct ds s;
+ /* Parse table_id separated with the follow-up actions by ",", if
+ * any. */
+ actions = ds_cstr(&in);
+ table_id = NULL;
+ if (strstr(actions, ",")) {
+ table_id = strsep(&actions, ",");
+ }
+
/* Parse hex bytes. */
- ofpbuf_init(&of10_in, 0);
- if (ofpbuf_put_hex(&of10_in, ds_cstr(&in), NULL)[0] != '\0') {
+ ofpbuf_init(&of_in, 0);
+ if (ofpbuf_put_hex(&of_in, actions, NULL)[0] != '\0') {
ovs_fatal(0, "Trailing garbage in hex data");
}
/* Convert to ofpacts. */
ofpbuf_init(&ofpacts, 0);
- size = ofpbuf_size(&of10_in);
- error = ofpacts_pull_openflow_actions(&of10_in, ofpbuf_size(&of10_in),
- OFP10_VERSION, &ofpacts);
+ size = ofpbuf_size(&of_in);
+ error = (instructions
+ ? ofpacts_pull_openflow_instructions
+ : ofpacts_pull_openflow_actions)(
+ &of_in, ofpbuf_size(&of_in), version, &ofpacts);
+ if (!error && instructions) {
+ /* Verify actions, enforce consistency. */
+ enum ofputil_protocol protocol;
+ struct flow flow;
+
+ memset(&flow, 0, sizeof flow);
+ protocol = ofputil_protocols_from_ofp_version(version);
+ error = ofpacts_check_consistency(ofpbuf_data(&ofpacts),
+ ofpbuf_size(&ofpacts),
+ &flow, OFPP_MAX,
+ table_id ? atoi(table_id) : 0,
+ 255, protocol);
+ }
if (error) {
- printf("bad OF1.0 actions: %s\n\n", ofperr_get_name(error));
+ printf("bad %s %s: %s\n\n",
+ version_s, instructions ? "instructions" : "actions",
+ ofperr_get_name(error));
ofpbuf_uninit(&ofpacts);
- ofpbuf_uninit(&of10_in);
+ ofpbuf_uninit(&of_in);
continue;
}
- ofpbuf_push_uninit(&of10_in, size);
+ ofpbuf_push_uninit(&of_in, size);
/* Print cls_rule. */
ds_init(&s);
ds_destroy(&s);
/* Convert back to ofp10 actions and print differences from input. */
- ofpbuf_init(&of10_out, 0);
- ofpacts_put_openflow_actions(ofpbuf_data(&ofpacts), ofpbuf_size(&ofpacts), &of10_out,
- OFP10_VERSION);
+ ofpbuf_init(&of_out, 0);
+ if (instructions) {
+ ofpacts_put_openflow_instructions( ofpbuf_data(&ofpacts),
+ ofpbuf_size(&ofpacts),
+ &of_out, version);
+ } else {
+ ofpacts_put_openflow_actions( ofpbuf_data(&ofpacts),
+ ofpbuf_size(&ofpacts),
+ &of_out, version);
+ }
- print_differences("", ofpbuf_data(&of10_in), ofpbuf_size(&of10_in),
- ofpbuf_data(&of10_out), ofpbuf_size(&of10_out));
+ print_differences("", ofpbuf_data(&of_in), ofpbuf_size(&of_in),
+ ofpbuf_data(&of_out), ofpbuf_size(&of_out));
putchar('\n');
ofpbuf_uninit(&ofpacts);
- ofpbuf_uninit(&of10_in);
- ofpbuf_uninit(&of10_out);
+ ofpbuf_uninit(&of_in);
+ ofpbuf_uninit(&of_out);
}
ds_destroy(&in);
}
+/* "parse-actions VERSION": reads a series of action specifications for the
+ * given OpenFlow VERSION 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_actions(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+{
+ ofctl_parse_actions__(argv[1], false);
+}
+
+/* "parse-actions VERSION": reads a series of instruction specifications for
+ * the given OpenFlow VERSION 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_instructions(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+{
+ ofctl_parse_actions__(argv[1], true);
+}
+
/* "parse-ofp10-match": reads a series of ofp10_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
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, NULL)) {
- 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 = 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));
- ofpbuf_uninit(&ofpacts);
- ofpbuf_uninit(&of11_in);
- continue;
- }
- ofpbuf_push_uninit(&of11_in, size);
-
- /* Print cls_rule. */
- ds_init(&s);
- ds_put_cstr(&s, "actions=");
- 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(ofpbuf_data(&ofpacts), ofpbuf_size(&ofpacts), &of11_out,
- OFP11_VERSION);
-
- print_differences("", ofpbuf_data(&of11_in), ofpbuf_size(&of11_in),
- ofpbuf_data(&of11_out), ofpbuf_size(&of11_out));
- 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, NULL)) {
- struct ofpbuf of11_out;
- struct ofpbuf of11_in;
- struct ofpbuf ofpacts;
- enum ofperr error;
- size_t size;
- struct ds s;
- const char *table_id;
- char *instructions;
-
- /* Parse table_id separated with the follow-up instructions by ",", if
- * any. */
- instructions = ds_cstr(&in);
- table_id = NULL;
- if (strstr(instructions, ",")) {
- table_id = strsep(&instructions, ",");
- }
-
- /* Parse hex bytes. */
- ofpbuf_init(&of11_in, 0);
- if (ofpbuf_put_hex(&of11_in, instructions, NULL)[0] != '\0') {
- ovs_fatal(0, "Trailing garbage in hex data");
- }
-
- /* Convert to ofpacts. */
- ofpbuf_init(&ofpacts, 0);
- 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(ofpbuf_data(&ofpacts), ofpbuf_size(&ofpacts),
- &flow, OFPP_MAX,
- table_id ? atoi(table_id) : 0,
- 255, OFPUTIL_P_OF11_STD);
- }
- 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);
- ds_put_cstr(&s, "actions=");
- 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(ofpbuf_data(&ofpacts), ofpbuf_size(&ofpacts),
- &of11_out, OFP13_VERSION);
-
- print_differences("", ofpbuf_data(&of11_in), ofpbuf_size(&of11_in),
- ofpbuf_data(&of11_out), ofpbuf_size(&of11_out));
- putchar('\n');
-
- ofpbuf_uninit(&ofpacts);
- ofpbuf_uninit(&of11_in);
- ofpbuf_uninit(&of11_out);
- }
- ds_destroy(&in);
-}
-
/* "parse-pcap PCAP": read packets from PCAP and print their flows. */
static void
ofctl_parse_pcap(int argc OVS_UNUSED, char *argv[])
}
for (;;) {
- struct ofpbuf *packet;
+ struct dp_packet *packet;
struct flow flow;
- const struct pkt_metadata md = PKT_METADATA_INITIALIZER(ODPP_NONE);
int error;
error = ovs_pcap_read(pcap, &packet, NULL);
ovs_fatal(error, "%s: read failed", argv[1]);
}
- flow_extract(packet, &md, &flow);
+ packet->md = PKT_METADATA_INITIALIZER(ODPP_NONE);
+ flow_extract(packet, &flow);
flow_print(stdout, &flow);
putchar('\n');
- ofpbuf_delete(packet);
+ dp_packet_delete(packet);
}
}
}
static const struct command all_commands[] = {
- { "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-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 },
- { "queue-get-config", 2, 2, ofctl_queue_get_config },
- { "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 },
- { "add-meter", 2, 2, ofctl_add_meter },
- { "mod-meter", 2, 2, ofctl_mod_meter },
- { "del-meter", 2, 2, ofctl_del_meters },
- { "del-meters", 1, 1, ofctl_del_meters },
- { "dump-meter", 2, 2, ofctl_dump_meters },
- { "dump-meters", 1, 1, ofctl_dump_meters },
- { "meter-stats", 1, 2, ofctl_meter_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, 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 },
- { "set-frags", 2, 2, ofctl_set_frags },
- { "probe", 1, 1, ofctl_probe },
- { "ping", 1, 2, ofctl_ping },
- { "benchmark", 3, 3, ofctl_benchmark },
-
- { "ofp-parse", 1, 1, ofctl_ofp_parse },
- { "ofp-parse-pcap", 1, INT_MAX, ofctl_ofp_parse_pcap },
-
- { "add-group", 1, 2, ofctl_add_group },
- { "add-groups", 1, 2, ofctl_add_groups },
- { "mod-group", 1, 2, ofctl_mod_group },
- { "del-groups", 1, 2, ofctl_del_groups },
- { "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 },
+ { "show", "switch",
+ 1, 1, ofctl_show },
+ { "monitor", "switch [misslen] [invalid_ttl] [watch:[...]]",
+ 1, 3, ofctl_monitor },
+ { "snoop", "switch",
+ 1, 1, ofctl_snoop },
+ { "dump-desc", "switch",
+ 1, 1, ofctl_dump_desc },
+ { "dump-tables", "switch",
+ 1, 1, ofctl_dump_tables },
+ { "dump-table-features", "switch",
+ 1, 1, ofctl_dump_table_features },
+ { "dump-flows", "switch",
+ 1, 2, ofctl_dump_flows },
+ { "dump-aggregate", "switch",
+ 1, 2, ofctl_dump_aggregate },
+ { "queue-stats", "switch [port [queue]]",
+ 1, 3, ofctl_queue_stats },
+ { "queue-get-config", "switch port",
+ 2, 2, ofctl_queue_get_config },
+ { "add-flow", "switch flow",
+ 2, 2, ofctl_add_flow },
+ { "add-flows", "switch file",
+ 2, 2, ofctl_add_flows },
+ { "mod-flows", "switch flow",
+ 2, 2, ofctl_mod_flows },
+ { "del-flows", "switch [flow]",
+ 1, 2, ofctl_del_flows },
+ { "replace-flows", "switch file",
+ 2, 2, ofctl_replace_flows },
+ { "diff-flows", "source1 source2",
+ 2, 2, ofctl_diff_flows },
+ { "add-meter", "switch meter",
+ 2, 2, ofctl_add_meter },
+ { "mod-meter", "switch meter",
+ 2, 2, ofctl_mod_meter },
+ { "del-meter", "switch meter",
+ 2, 2, ofctl_del_meters },
+ { "del-meters", "switch",
+ 1, 1, ofctl_del_meters },
+ { "dump-meter", "switch meter",
+ 2, 2, ofctl_dump_meters },
+ { "dump-meters", "switch",
+ 1, 1, ofctl_dump_meters },
+ { "meter-stats", "switch [meter]",
+ 1, 2, ofctl_meter_stats },
+ { "meter-features", "switch",
+ 1, 1, ofctl_meter_features },
+ { "packet-out", "switch in_port actions packet...",
+ 4, INT_MAX, ofctl_packet_out },
+ { "dump-ports", "switch [port]",
+ 1, 2, ofctl_dump_ports },
+ { "dump-ports-desc", "switch [port]",
+ 1, 2, ofctl_dump_ports_desc },
+ { "mod-port", "switch iface act",
+ 3, 3, ofctl_mod_port },
+ { "mod-table", "switch mod",
+ 3, 3, ofctl_mod_table },
+ { "get-frags", "switch",
+ 1, 1, ofctl_get_frags },
+ { "set-frags", "switch frag_mode",
+ 2, 2, ofctl_set_frags },
+ { "probe", "target",
+ 1, 1, ofctl_probe },
+ { "ping", "target [n]",
+ 1, 2, ofctl_ping },
+ { "benchmark", "target n count",
+ 3, 3, ofctl_benchmark },
+
+ { "ofp-parse", "file",
+ 1, 1, ofctl_ofp_parse },
+ { "ofp-parse-pcap", "pcap",
+ 1, INT_MAX, ofctl_ofp_parse_pcap },
+
+ { "add-group", "switch group",
+ 1, 2, ofctl_add_group },
+ { "add-groups", "switch file",
+ 1, 2, ofctl_add_groups },
+ { "mod-group", "switch group",
+ 1, 2, ofctl_mod_group },
+ { "del-groups", "switch [group]",
+ 1, 2, ofctl_del_groups },
+ { "insert-buckets", "switch [group]",
+ 1, 2, ofctl_insert_bucket },
+ { "remove-buckets", "switch [group]",
+ 1, 2, ofctl_remove_bucket },
+ { "dump-groups", "switch [group]",
+ 1, 2, ofctl_dump_group_desc },
+ { "dump-group-stats", "switch [group]",
+ 1, 2, ofctl_dump_group_stats },
+ { "dump-group-features", "switch",
+ 1, 1, ofctl_dump_group_features },
+ { "help", NULL, 0, INT_MAX, ofctl_help },
+ { "list-commands", NULL, 0, INT_MAX, ofctl_list_commands },
/* Undocumented commands for testing. */
- { "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", 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 },
- { "parse-ofp11-actions", 0, 0, ofctl_parse_ofp11_actions },
- { "parse-ofp11-instructions", 0, 0, ofctl_parse_ofp11_instructions },
- { "parse-pcap", 1, 1, ofctl_parse_pcap },
- { "check-vlan", 2, 2, ofctl_check_vlan },
- { "print-error", 1, 1, ofctl_print_error },
- { "encode-error-reply", 2, 2, ofctl_encode_error_reply },
- { "ofp-print", 1, 2, ofctl_ofp_print },
- { "encode-hello", 1, 1, ofctl_encode_hello },
-
- { NULL, 0, 0, NULL },
+ { "parse-flow", NULL, 1, 1, ofctl_parse_flow },
+ { "parse-flows", NULL, 1, 1, ofctl_parse_flows },
+ { "parse-nx-match", NULL, 0, 0, ofctl_parse_nxm },
+ { "parse-nxm", NULL, 0, 0, ofctl_parse_nxm },
+ { "parse-oxm", NULL, 1, 1, ofctl_parse_oxm },
+ { "parse-actions", NULL, 1, 1, ofctl_parse_actions },
+ { "parse-instructions", NULL, 1, 1, ofctl_parse_instructions },
+ { "parse-ofp10-match", NULL, 0, 0, ofctl_parse_ofp10_match },
+ { "parse-ofp11-match", NULL, 0, 0, ofctl_parse_ofp11_match },
+ { "parse-pcap", NULL, 1, 1, ofctl_parse_pcap },
+ { "check-vlan", NULL, 2, 2, ofctl_check_vlan },
+ { "print-error", NULL, 1, 1, ofctl_print_error },
+ { "encode-error-reply", NULL, 2, 2, ofctl_encode_error_reply },
+ { "ofp-print", NULL, 1, 2, ofctl_ofp_print },
+ { "encode-hello", NULL, 1, 1, ofctl_encode_hello },
+
+ { NULL, NULL, 0, 0, NULL },
};
static const struct command *get_all_commands(void)