int
main(int argc, char *argv[])
{
+ struct ovs_cmdl_context ctx = { .argc = 0, };
set_program_name(argv[0]);
service_start(&argc, &argv);
parse_options(argc, argv);
fatal_ignore_sigpipe();
- ovs_cmdl_run_command(argc - optind, argv + optind, get_all_commands());
+ ctx.argc = argc - optind;
+ ctx.argv = argv + optind;
+ ovs_cmdl_run_command(&ctx, get_all_commands());
return 0;
}
}
static void
-ofctl_show(int argc OVS_UNUSED, char *argv[])
+ofctl_show(struct ovs_cmdl_context *ctx)
{
- const char *vconn_name = argv[1];
+ const char *vconn_name = ctx->argv[1];
enum ofp_version version;
struct vconn *vconn;
struct ofpbuf *request;
}
static void
-ofctl_dump_desc(int argc OVS_UNUSED, char *argv[])
+ofctl_dump_desc(struct ovs_cmdl_context *ctx)
{
- dump_trivial_stats_transaction(argv[1], OFPRAW_OFPST_DESC_REQUEST);
+ dump_trivial_stats_transaction(ctx->argv[1], OFPRAW_OFPST_DESC_REQUEST);
}
static void
-ofctl_dump_tables(int argc OVS_UNUSED, char *argv[])
+ofctl_dump_tables(struct ovs_cmdl_context *ctx)
{
- dump_trivial_stats_transaction(argv[1], OFPRAW_OFPST_TABLE_REQUEST);
+ dump_trivial_stats_transaction(ctx->argv[1], OFPRAW_OFPST_TABLE_REQUEST);
}
static void
-ofctl_dump_table_features(int argc OVS_UNUSED, char *argv[])
+ofctl_dump_table_features(struct ovs_cmdl_context *ctx)
{
struct ofpbuf *request;
struct vconn *vconn;
- open_vconn(argv[1], &vconn);
+ open_vconn(ctx->argv[1], &vconn);
request = ofputil_encode_table_features_request(vconn_get_version(vconn));
if (request) {
dump_stats_transaction(vconn, request);
}
static void
-ofctl_dump_flows(int argc, char *argv[])
+ofctl_dump_flows(struct ovs_cmdl_context *ctx)
{
if (!n_criteria) {
- ofctl_dump_flows__(argc, argv, false);
+ ofctl_dump_flows__(ctx->argc, ctx->argv, false);
return;
} else {
struct ofputil_flow_stats *fses;
struct ds s;
size_t i;
- vconn = prepare_dump_flows(argc, argv, false, &request);
+ vconn = prepare_dump_flows(ctx->argc, ctx->argv, false, &request);
send_xid = ((struct ofp_header *) request->data)->xid;
send_openflow_buffer(vconn, request);
}
static void
-ofctl_dump_aggregate(int argc, char *argv[])
+ofctl_dump_aggregate(struct ovs_cmdl_context *ctx)
{
- ofctl_dump_flows__(argc, argv, true);
+ ofctl_dump_flows__(ctx->argc, ctx->argv, true);
}
static void
-ofctl_queue_stats(int argc, char *argv[])
+ofctl_queue_stats(struct ovs_cmdl_context *ctx)
{
struct ofpbuf *request;
struct vconn *vconn;
struct ofputil_queue_stats_request oqs;
- open_vconn(argv[1], &vconn);
+ open_vconn(ctx->argv[1], &vconn);
- if (argc > 2 && argv[2][0] && strcasecmp(argv[2], "all")) {
- oqs.port_no = str_to_port_no(argv[1], argv[2]);
+ if (ctx->argc > 2 && ctx->argv[2][0] && strcasecmp(ctx->argv[2], "all")) {
+ oqs.port_no = str_to_port_no(ctx->argv[1], ctx->argv[2]);
} else {
oqs.port_no = OFPP_ANY;
}
- if (argc > 3 && argv[3][0] && strcasecmp(argv[3], "all")) {
- oqs.queue_id = atoi(argv[3]);
+ if (ctx->argc > 3 && ctx->argv[3][0] && strcasecmp(ctx->argv[3], "all")) {
+ oqs.queue_id = atoi(ctx->argv[3]);
} else {
oqs.queue_id = OFPQ_ALL;
}
}
static void
-ofctl_queue_get_config(int argc OVS_UNUSED, char *argv[])
+ofctl_queue_get_config(struct ovs_cmdl_context *ctx)
{
- const char *vconn_name = argv[1];
- const char *port_name = argv[2];
+ const char *vconn_name = ctx->argv[1];
+ const char *port_name = ctx->argv[2];
enum ofputil_protocol protocol;
enum ofp_version version;
struct ofpbuf *request;
}
static void
-ofctl_add_flow(int argc, char *argv[])
+ofctl_add_flow(struct ovs_cmdl_context *ctx)
{
- ofctl_flow_mod(argc, argv, OFPFC_ADD);
+ ofctl_flow_mod(ctx->argc, ctx->argv, OFPFC_ADD);
}
static void
-ofctl_add_flows(int argc, char *argv[])
+ofctl_add_flows(struct ovs_cmdl_context *ctx)
{
- ofctl_flow_mod_file(argc, argv, OFPFC_ADD);
+ ofctl_flow_mod_file(ctx->argc, ctx->argv, OFPFC_ADD);
}
static void
-ofctl_mod_flows(int argc, char *argv[])
+ofctl_mod_flows(struct ovs_cmdl_context *ctx)
{
- ofctl_flow_mod(argc, argv, strict ? OFPFC_MODIFY_STRICT : OFPFC_MODIFY);
+ ofctl_flow_mod(ctx->argc, ctx->argv, strict ? OFPFC_MODIFY_STRICT : OFPFC_MODIFY);
}
static void
-ofctl_del_flows(int argc, char *argv[])
+ofctl_del_flows(struct ovs_cmdl_context *ctx)
{
- ofctl_flow_mod(argc, argv, strict ? OFPFC_DELETE_STRICT : OFPFC_DELETE);
+ ofctl_flow_mod(ctx->argc, ctx->argv, strict ? OFPFC_DELETE_STRICT : OFPFC_DELETE);
}
static void
}
static void
-ofctl_monitor(int argc, char *argv[])
+ofctl_monitor(struct ovs_cmdl_context *ctx)
{
struct vconn *vconn;
int i;
enum ofputil_protocol usable_protocols;
- open_vconn(argv[1], &vconn);
- for (i = 2; i < argc; i++) {
- const char *arg = argv[i];
+ open_vconn(ctx->argv[1], &vconn);
+ for (i = 2; i < ctx->argc; i++) {
+ const char *arg = ctx->argv[i];
if (isdigit((unsigned char) *arg)) {
struct ofp_switch_config config;
}
static void
-ofctl_snoop(int argc OVS_UNUSED, char *argv[])
+ofctl_snoop(struct ovs_cmdl_context *ctx)
{
struct vconn *vconn;
- open_vconn__(argv[1], SNOOP, &vconn);
+ open_vconn__(ctx->argv[1], SNOOP, &vconn);
monitor_vconn(vconn, false);
}
static void
-ofctl_dump_ports(int argc, char *argv[])
+ofctl_dump_ports(struct ovs_cmdl_context *ctx)
{
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;
+ open_vconn(ctx->argv[1], &vconn);
+ port = ctx->argc > 2 ? str_to_port_no(ctx->argv[1], ctx->argv[2]) : OFPP_ANY;
request = ofputil_encode_dump_ports_request(vconn_get_version(vconn), port);
dump_stats_transaction(vconn, request);
vconn_close(vconn);
}
static void
-ofctl_dump_ports_desc(int argc OVS_UNUSED, char *argv[])
+ofctl_dump_ports_desc(struct ovs_cmdl_context *ctx)
{
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;
+ open_vconn(ctx->argv[1], &vconn);
+ port = ctx->argc > 2 ? str_to_port_no(ctx->argv[1], ctx->argv[2]) : OFPP_ANY;
request = ofputil_encode_port_desc_stats_request(vconn_get_version(vconn),
port);
dump_stats_transaction(vconn, request);
}
static void
-ofctl_probe(int argc OVS_UNUSED, char *argv[])
+ofctl_probe(struct ovs_cmdl_context *ctx)
{
struct ofpbuf *request;
struct vconn *vconn;
struct ofpbuf *reply;
- open_vconn(argv[1], &vconn);
+ open_vconn(ctx->argv[1], &vconn);
request = make_echo_request(vconn_get_version(vconn));
- run(vconn_transact(vconn, request, &reply), "talking to %s", argv[1]);
+ run(vconn_transact(vconn, request, &reply), "talking to %s", ctx->argv[1]);
if (reply->size != sizeof(struct ofp_header)) {
ovs_fatal(0, "reply does not match request");
}
}
static void
-ofctl_packet_out(int argc, char *argv[])
+ofctl_packet_out(struct ovs_cmdl_context *ctx)
{
enum ofputil_protocol protocol;
struct ofputil_packet_out po;
enum ofputil_protocol usable_protocols; /* XXX: Use in proto selection */
ofpbuf_init(&ofpacts, 64);
- error = ofpacts_parse_actions(argv[3], &ofpacts, &usable_protocols);
+ error = ofpacts_parse_actions(ctx->argv[3], &ofpacts, &usable_protocols);
if (error) {
ovs_fatal(0, "%s", error);
}
po.buffer_id = UINT32_MAX;
- po.in_port = str_to_port_no(argv[1], argv[2]);
+ po.in_port = str_to_port_no(ctx->argv[1], ctx->argv[2]);
po.ofpacts = ofpacts.data;
po.ofpacts_len = ofpacts.size;
- protocol = open_vconn(argv[1], &vconn);
- for (i = 4; i < argc; i++) {
+ protocol = open_vconn(ctx->argv[1], &vconn);
+ for (i = 4; i < ctx->argc; i++) {
struct dp_packet *packet;
struct ofpbuf *opo;
const char *error_msg;
- error_msg = eth_from_hex(argv[i], &packet);
+ error_msg = eth_from_hex(ctx->argv[i], &packet);
if (error_msg) {
ovs_fatal(0, "%s", error_msg);
}
}
static void
-ofctl_mod_port(int argc OVS_UNUSED, char *argv[])
+ofctl_mod_port(struct ovs_cmdl_context *ctx)
{
struct ofp_config_flag {
const char *name; /* The flag's name. */
const char *command;
bool not;
- fetch_ofputil_phy_port(argv[1], argv[2], &pp);
+ fetch_ofputil_phy_port(ctx->argv[1], ctx->argv[2], &pp);
pm.port_no = pp.port_no;
memcpy(pm.hw_addr, pp.hw_addr, ETH_ADDR_LEN);
pm.mask = 0;
pm.advertise = 0;
- if (!strncasecmp(argv[3], "no-", 3)) {
- command = argv[3] + 3;
+ if (!strncasecmp(ctx->argv[3], "no-", 3)) {
+ command = ctx->argv[3] + 3;
not = true;
- } else if (!strncasecmp(argv[3], "no", 2)) {
- command = argv[3] + 2;
+ } else if (!strncasecmp(ctx->argv[3], "no", 2)) {
+ command = ctx->argv[3] + 2;
not = true;
} else {
- command = argv[3];
+ command = ctx->argv[3];
not = false;
}
for (flag = flags; flag < &flags[ARRAY_SIZE(flags)]; flag++) {
goto found;
}
}
- ovs_fatal(0, "unknown mod-port command '%s'", argv[3]);
+ ovs_fatal(0, "unknown mod-port command '%s'", ctx->argv[3]);
found:
- protocol = open_vconn(argv[1], &vconn);
+ protocol = open_vconn(ctx->argv[1], &vconn);
transact_noreply(vconn, ofputil_encode_port_mod(&pm, protocol));
vconn_close(vconn);
}
static void
-ofctl_mod_table(int argc OVS_UNUSED, char *argv[])
+ofctl_mod_table(struct ovs_cmdl_context *ctx)
{
enum ofputil_protocol protocol, usable_protocols;
struct ofputil_table_mod tm;
char *error;
int i;
- error = parse_ofp_table_mod(&tm, argv[2], argv[3], &usable_protocols);
+ error = parse_ofp_table_mod(&tm, ctx->argv[2], ctx->argv[3], &usable_protocols);
if (error) {
ovs_fatal(0, "%s", error);
}
- protocol = open_vconn(argv[1], &vconn);
+ protocol = open_vconn(ctx->argv[1], &vconn);
if (!(protocol & usable_protocols)) {
for (i = 0; i < sizeof(enum ofputil_protocol) * CHAR_BIT; i++) {
enum ofputil_protocol f = 1 << i;
}
static void
-ofctl_get_frags(int argc OVS_UNUSED, char *argv[])
+ofctl_get_frags(struct ovs_cmdl_context *ctx)
{
struct ofp_switch_config config;
struct vconn *vconn;
- open_vconn(argv[1], &vconn);
+ open_vconn(ctx->argv[1], &vconn);
fetch_switch_config(vconn, &config);
puts(ofputil_frag_handling_to_string(ntohs(config.flags)));
vconn_close(vconn);
}
static void
-ofctl_set_frags(int argc OVS_UNUSED, char *argv[])
+ofctl_set_frags(struct ovs_cmdl_context *ctx)
{
struct ofp_switch_config config;
enum ofp_config_flags mode;
struct vconn *vconn;
ovs_be16 flags;
- if (!ofputil_frag_handling_from_string(argv[2], &mode)) {
- ovs_fatal(0, "%s: unknown fragment handling mode", argv[2]);
+ if (!ofputil_frag_handling_from_string(ctx->argv[2], &mode)) {
+ ovs_fatal(0, "%s: unknown fragment handling mode", ctx->argv[2]);
}
- open_vconn(argv[1], &vconn);
+ open_vconn(ctx->argv[1], &vconn);
fetch_switch_config(vconn, &config);
flags = htons(mode) | (config.flags & htons(~OFPC_FRAG_MASK));
if (flags != config.flags) {
if (flags != config.flags) {
ovs_fatal(0, "%s: setting fragment handling mode failed (this "
"switch probably doesn't support mode \"%s\")",
- argv[1], ofputil_frag_handling_to_string(mode));
+ ctx->argv[1], ofputil_frag_handling_to_string(mode));
}
}
vconn_close(vconn);
}
static void
-ofctl_ofp_parse(int argc OVS_UNUSED, char *argv[])
+ofctl_ofp_parse(struct ovs_cmdl_context *ctx)
{
- const char *filename = argv[1];
+ const char *filename = ctx->argv[1];
struct ofpbuf b;
FILE *file;
}
static void
-ofctl_ofp_parse_pcap(int argc OVS_UNUSED, char *argv[])
+ofctl_ofp_parse_pcap(struct ovs_cmdl_context *ctx)
{
struct tcp_reader *reader;
FILE *file;
int error;
bool first;
- file = ovs_pcap_open(argv[1], "rb");
+ file = ovs_pcap_open(ctx->argv[1], "rb");
if (!file) {
- ovs_fatal(errno, "%s: open failed", argv[1]);
+ ovs_fatal(errno, "%s: open failed", ctx->argv[1]);
}
reader = tcp_reader_open();
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))) {
+ && (is_openflow_port(flow.tp_src, ctx->argv + 2) ||
+ is_openflow_port(flow.tp_dst, ctx->argv + 2))) {
struct dp_packet *payload = tcp_reader_run(reader, &flow, packet);
if (payload) {
while (dp_packet_size(payload) >= sizeof(struct ofp_header)) {
}
static void
-ofctl_ping(int argc, char *argv[])
+ofctl_ping(struct ovs_cmdl_context *ctx)
{
size_t max_payload = 65535 - sizeof(struct ofp_header);
unsigned int payload;
struct vconn *vconn;
int i;
- payload = argc > 2 ? atoi(argv[2]) : 64;
+ payload = ctx->argc > 2 ? atoi(ctx->argv[2]) : 64;
if (payload > max_payload) {
ovs_fatal(0, "payload must be between 0 and %"PRIuSIZE" bytes", max_payload);
}
- open_vconn(argv[1], &vconn);
+ open_vconn(ctx->argv[1], &vconn);
for (i = 0; i < 10; i++) {
struct timeval start, end;
struct ofpbuf *request, *reply;
ofp_print(stdout, reply, reply->size, verbosity + 2);
}
printf("%"PRIu32" bytes from %s: xid=%08"PRIx32" time=%.1f ms\n",
- reply->size, argv[1], ntohl(rpy_hdr->xid),
+ reply->size, ctx->argv[1], ntohl(rpy_hdr->xid),
(1000*(double)(end.tv_sec - start.tv_sec))
+ (.001*(end.tv_usec - start.tv_usec)));
ofpbuf_delete(request);
}
static void
-ofctl_benchmark(int argc OVS_UNUSED, char *argv[])
+ofctl_benchmark(struct ovs_cmdl_context *ctx)
{
size_t max_payload = 65535 - sizeof(struct ofp_header);
struct timeval start, end;
int count;
int i;
- payload_size = atoi(argv[2]);
+ payload_size = atoi(ctx->argv[2]);
if (payload_size > max_payload) {
ovs_fatal(0, "payload must be between 0 and %"PRIuSIZE" bytes", max_payload);
}
message_size = sizeof(struct ofp_header) + payload_size;
- count = atoi(argv[3]);
+ count = atoi(ctx->argv[3]);
printf("Sending %d packets * %u bytes (with header) = %u bytes total\n",
count, message_size, count * message_size);
- open_vconn(argv[1], &vconn);
+ open_vconn(ctx->argv[1], &vconn);
xgettimeofday(&start);
for (i = 0; i < count; i++) {
struct ofpbuf *request, *reply;
}
static void
-ofctl_add_group(int argc, char *argv[])
+ofctl_add_group(struct ovs_cmdl_context *ctx)
{
- ofctl_group_mod(argc, argv, OFPGC11_ADD);
+ ofctl_group_mod(ctx->argc, ctx->argv, OFPGC11_ADD);
}
static void
-ofctl_add_groups(int argc, char *argv[])
+ofctl_add_groups(struct ovs_cmdl_context *ctx)
{
- ofctl_group_mod_file(argc, argv, OFPGC11_ADD);
+ ofctl_group_mod_file(ctx->argc, ctx->argv, OFPGC11_ADD);
}
static void
-ofctl_mod_group(int argc, char *argv[])
+ofctl_mod_group(struct ovs_cmdl_context *ctx)
{
- ofctl_group_mod(argc, argv, OFPGC11_MODIFY);
+ ofctl_group_mod(ctx->argc, ctx->argv, OFPGC11_MODIFY);
}
static void
-ofctl_del_groups(int argc, char *argv[])
+ofctl_del_groups(struct ovs_cmdl_context *ctx)
{
- ofctl_group_mod(argc, argv, OFPGC11_DELETE);
+ ofctl_group_mod(ctx->argc, ctx->argv, OFPGC11_DELETE);
}
static void
-ofctl_insert_bucket(int argc, char *argv[])
+ofctl_insert_bucket(struct ovs_cmdl_context *ctx)
{
- ofctl_group_mod(argc, argv, OFPGC15_INSERT_BUCKET);
+ ofctl_group_mod(ctx->argc, ctx->argv, OFPGC15_INSERT_BUCKET);
}
static void
-ofctl_remove_bucket(int argc, char *argv[])
+ofctl_remove_bucket(struct ovs_cmdl_context *ctx)
{
- ofctl_group_mod(argc, argv, OFPGC15_REMOVE_BUCKET);
+ ofctl_group_mod(ctx->argc, ctx->argv, OFPGC15_REMOVE_BUCKET);
}
static void
-ofctl_dump_group_stats(int argc, char *argv[])
+ofctl_dump_group_stats(struct ovs_cmdl_context *ctx)
{
enum ofputil_protocol usable_protocols;
struct ofputil_group_mod gm;
memset(&gm, 0, sizeof gm);
error = parse_ofp_group_mod_str(&gm, OFPGC11_DELETE,
- argc > 2 ? argv[2] : "",
+ ctx->argc > 2 ? ctx->argv[2] : "",
&usable_protocols);
if (error) {
ovs_fatal(0, "%s", error);
group_id = gm.group_id;
- open_vconn(argv[1], &vconn);
+ open_vconn(ctx->argv[1], &vconn);
request = ofputil_encode_group_stats_request(vconn_get_version(vconn),
group_id);
if (request) {
}
static void
-ofctl_dump_group_desc(int argc OVS_UNUSED, char *argv[])
+ofctl_dump_group_desc(struct ovs_cmdl_context *ctx)
{
struct ofpbuf *request;
struct vconn *vconn;
uint32_t group_id;
- open_vconn(argv[1], &vconn);
+ open_vconn(ctx->argv[1], &vconn);
- if (argc < 3 || !ofputil_group_from_string(argv[2], &group_id)) {
+ if (ctx->argc < 3 || !ofputil_group_from_string(ctx->argv[2], &group_id)) {
group_id = OFPG11_ALL;
}
}
static void
-ofctl_dump_group_features(int argc OVS_UNUSED, char *argv[])
+ofctl_dump_group_features(struct ovs_cmdl_context *ctx)
{
struct ofpbuf *request;
struct vconn *vconn;
- open_vconn(argv[1], &vconn);
+ open_vconn(ctx->argv[1], &vconn);
request = ofputil_encode_group_features_request(vconn_get_version(vconn));
if (request) {
dump_stats_transaction(vconn, request);
}
static void
-ofctl_help(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+ofctl_help(struct ovs_cmdl_context *ctx OVS_UNUSED)
{
usage();
}
static void
-ofctl_list_commands(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+ofctl_list_commands(struct ovs_cmdl_context *ctx OVS_UNUSED)
{
ovs_cmdl_print_commands(get_all_commands());
}
}
static void
-ofctl_replace_flows(int argc OVS_UNUSED, char *argv[])
+ofctl_replace_flows(struct ovs_cmdl_context *ctx)
{
enum { FILE_IDX = 0, SWITCH_IDX = 1 };
enum ofputil_protocol usable_protocols, protocol;
struct fte *fte;
classifier_init(&cls, NULL);
- usable_protocols = read_flows_from_file(argv[2], &cls, FILE_IDX);
+ usable_protocols = read_flows_from_file(ctx->argv[2], &cls, FILE_IDX);
- protocol = open_vconn(argv[1], &vconn);
+ protocol = open_vconn(ctx->argv[1], &vconn);
protocol = set_protocol_for_flow_dump(vconn, protocol, usable_protocols);
read_flows_from_switch(vconn, protocol, &cls, SWITCH_IDX);
}
static void
-ofctl_diff_flows(int argc OVS_UNUSED, char *argv[])
+ofctl_diff_flows(struct ovs_cmdl_context *ctx)
{
bool differences = false;
struct classifier cls;
struct fte *fte;
classifier_init(&cls, NULL);
- read_flows_from_source(argv[1], &cls, 0);
- read_flows_from_source(argv[2], &cls, 1);
+ read_flows_from_source(ctx->argv[1], &cls, 0);
+ read_flows_from_source(ctx->argv[2], &cls, 1);
ds_init(&a_s);
ds_init(&b_s);
static void
-ofctl_add_meter(int argc OVS_UNUSED, char *argv[])
+ofctl_add_meter(struct ovs_cmdl_context *ctx)
{
- ofctl_meter_mod__(argv[1], argv[2], OFPMC13_ADD);
+ ofctl_meter_mod__(ctx->argv[1], ctx->argv[2], OFPMC13_ADD);
}
static void
-ofctl_mod_meter(int argc OVS_UNUSED, char *argv[])
+ofctl_mod_meter(struct ovs_cmdl_context *ctx)
{
- ofctl_meter_mod__(argv[1], argv[2], OFPMC13_MODIFY);
+ ofctl_meter_mod__(ctx->argv[1], ctx->argv[2], OFPMC13_MODIFY);
}
static void
-ofctl_del_meters(int argc, char *argv[])
+ofctl_del_meters(struct ovs_cmdl_context *ctx)
{
- ofctl_meter_mod__(argv[1], argc > 2 ? argv[2] : NULL, OFPMC13_DELETE);
+ ofctl_meter_mod__(ctx->argv[1], ctx->argc > 2 ? ctx->argv[2] : NULL, OFPMC13_DELETE);
}
static void
-ofctl_dump_meters(int argc, char *argv[])
+ofctl_dump_meters(struct ovs_cmdl_context *ctx)
{
- ofctl_meter_request__(argv[1], argc > 2 ? argv[2] : NULL,
+ ofctl_meter_request__(ctx->argv[1], ctx->argc > 2 ? ctx->argv[2] : NULL,
OFPUTIL_METER_CONFIG);
}
static void
-ofctl_meter_stats(int argc, char *argv[])
+ofctl_meter_stats(struct ovs_cmdl_context *ctx)
{
- ofctl_meter_request__(argv[1], argc > 2 ? argv[2] : NULL,
+ ofctl_meter_request__(ctx->argv[1], ctx->argc > 2 ? ctx->argv[2] : NULL,
OFPUTIL_METER_STATS);
}
static void
-ofctl_meter_features(int argc OVS_UNUSED, char *argv[])
+ofctl_meter_features(struct ovs_cmdl_context *ctx)
{
- ofctl_meter_request__(argv[1], NULL, OFPUTIL_METER_FEATURES);
+ ofctl_meter_request__(ctx->argv[1], NULL, OFPUTIL_METER_FEATURES);
}
\f
/* "parse-flow FLOW": parses the argument as a flow (like add-flow) and prints
* it back to stdout. */
static void
-ofctl_parse_flow(int argc OVS_UNUSED, char *argv[])
+ofctl_parse_flow(struct ovs_cmdl_context *ctx)
{
enum ofputil_protocol usable_protocols;
struct ofputil_flow_mod fm;
char *error;
- error = parse_ofp_flow_mod_str(&fm, argv[1], OFPFC_ADD, &usable_protocols);
+ error = parse_ofp_flow_mod_str(&fm, ctx->argv[1], OFPFC_ADD, &usable_protocols);
if (error) {
ovs_fatal(0, "%s", error);
}
/* "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
-ofctl_parse_flows(int argc OVS_UNUSED, char *argv[])
+ofctl_parse_flows(struct ovs_cmdl_context *ctx)
{
enum ofputil_protocol usable_protocols;
struct ofputil_flow_mod *fms = NULL;
size_t n_fms = 0;
char *error;
- error = parse_ofp_flow_mod_file(argv[1], OFPFC_ADD, &fms, &n_fms,
+ error = parse_ofp_flow_mod_file(ctx->argv[1], OFPFC_ADD, &fms, &n_fms,
&usable_protocols);
if (error) {
ovs_fatal(0, "%s", error);
* 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)
+ofctl_parse_nxm(struct ovs_cmdl_context *ctx OVS_UNUSED)
{
ofctl_parse_nxm__(false, 0);
}
* 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[])
+ofctl_parse_oxm(struct ovs_cmdl_context *ctx)
{
- enum ofp_version version = ofputil_version_from_string(argv[1]);
+ enum ofp_version version = ofputil_version_from_string(ctx->argv[1]);
if (version < OFP12_VERSION) {
- ovs_fatal(0, "%s: not a valid version for OXM", argv[1]);
+ ovs_fatal(0, "%s: not a valid version for OXM", ctx->argv[1]);
}
ofctl_parse_nxm__(true, version);
* 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(struct ovs_cmdl_context *ctx)
{
- ofctl_parse_actions__(argv[1], false);
+ ofctl_parse_actions__(ctx->argv[1], false);
}
/* "parse-actions VERSION": reads a series of instruction specifications for
* 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_instructions(struct ovs_cmdl_context *ctx)
{
- ofctl_parse_actions__(argv[1], true);
+ ofctl_parse_actions__(ctx->argv[1], true);
}
/* "parse-ofp10-match": reads a series of ofp10_match specifications as hex
* them back to hex bytes. ovs-ofctl actually sets "x"s to random bits when
* it does the conversion to hex, to ensure that in fact they are ignored. */
static void
-ofctl_parse_ofp10_match(int argc OVS_UNUSED, char *argv[] OVS_UNUSED)
+ofctl_parse_ofp10_match(struct ovs_cmdl_context *ctx OVS_UNUSED)
{
struct ds expout;
struct ds in;
* 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)
+ofctl_parse_ofp11_match(struct ovs_cmdl_context *ctx OVS_UNUSED)
{
struct ds in;
/* "parse-pcap PCAP": read packets from PCAP and print their flows. */
static void
-ofctl_parse_pcap(int argc OVS_UNUSED, char *argv[])
+ofctl_parse_pcap(struct ovs_cmdl_context *ctx)
{
FILE *pcap;
- pcap = ovs_pcap_open(argv[1], "rb");
+ pcap = ovs_pcap_open(ctx->argv[1], "rb");
if (!pcap) {
- ovs_fatal(errno, "%s: open failed", argv[1]);
+ ovs_fatal(errno, "%s: open failed", ctx->argv[1]);
}
for (;;) {
if (error == EOF) {
break;
} else if (error) {
- ovs_fatal(error, "%s: read failed", argv[1]);
+ ovs_fatal(error, "%s: read failed", ctx->argv[1]);
}
packet->md = PKT_METADATA_INITIALIZER(ODPP_NONE);
/* "check-vlan VLAN_TCI VLAN_TCI_MASK": converts the specified vlan_tci and
* mask values to and from various formats and prints the results. */
static void
-ofctl_check_vlan(int argc OVS_UNUSED, char *argv[])
+ofctl_check_vlan(struct ovs_cmdl_context *ctx)
{
struct match match;
enum ofputil_protocol usable_protocols; /* Unused for now. */
match_init_catchall(&match);
- match.flow.vlan_tci = htons(strtoul(argv[1], NULL, 16));
- match.wc.masks.vlan_tci = htons(strtoul(argv[2], NULL, 16));
+ match.flow.vlan_tci = htons(strtoul(ctx->argv[1], NULL, 16));
+ match.wc.masks.vlan_tci = htons(strtoul(ctx->argv[2], NULL, 16));
/* Convert to and from string. */
string_s = match_to_string(&match, OFP_DEFAULT_PRIORITY);
/* "print-error ENUM": Prints the type and code of ENUM for every OpenFlow
* version. */
static void
-ofctl_print_error(int argc OVS_UNUSED, char *argv[])
+ofctl_print_error(struct ovs_cmdl_context *ctx)
{
enum ofperr error;
int version;
- error = ofperr_from_name(argv[1]);
+ error = ofperr_from_name(ctx->argv[1]);
if (!error) {
- ovs_fatal(0, "unknown error \"%s\"", argv[1]);
+ ovs_fatal(0, "unknown error \"%s\"", ctx->argv[1]);
}
for (version = 0; version <= UINT8_MAX; version++) {
/* "encode-error-reply ENUM REQUEST": Encodes an error reply to REQUEST for the
* error named ENUM and prints the error reply in hex. */
static void
-ofctl_encode_error_reply(int argc OVS_UNUSED, char *argv[])
+ofctl_encode_error_reply(struct ovs_cmdl_context *ctx)
{
const struct ofp_header *oh;
struct ofpbuf request, *reply;
enum ofperr error;
- error = ofperr_from_name(argv[1]);
+ error = ofperr_from_name(ctx->argv[1]);
if (!error) {
- ovs_fatal(0, "unknown error \"%s\"", argv[1]);
+ ovs_fatal(0, "unknown error \"%s\"", ctx->argv[1]);
}
ofpbuf_init(&request, 0);
- if (ofpbuf_put_hex(&request, argv[2], NULL)[0] != '\0') {
+ if (ofpbuf_put_hex(&request, ctx->argv[2], NULL)[0] != '\0') {
ovs_fatal(0, "Trailing garbage in hex data");
}
if (request.size < sizeof(struct ofp_header)) {
* Alternative usage: "ofp-print [VERBOSITY] - < HEXSTRING_FILE", where
* HEXSTRING_FILE contains the HEXSTRING. */
static void
-ofctl_ofp_print(int argc, char *argv[])
+ofctl_ofp_print(struct ovs_cmdl_context *ctx)
{
struct ofpbuf packet;
char *buffer;
ds_init(&line);
- if (!strcmp(argv[argc-1], "-")) {
+ if (!strcmp(ctx->argv[ctx->argc-1], "-")) {
if (ds_get_line(&line, stdin)) {
VLOG_FATAL("Failed to read stdin");
}
buffer = line.string;
- verbosity = argc > 2 ? atoi(argv[1]) : verbosity;
- } else if (argc > 2) {
- buffer = argv[1];
- verbosity = atoi(argv[2]);
+ verbosity = ctx->argc > 2 ? atoi(ctx->argv[1]) : verbosity;
+ } else if (ctx->argc > 2) {
+ buffer = ctx->argv[1];
+ verbosity = atoi(ctx->argv[2]);
} else {
- buffer = argv[1];
+ buffer = ctx->argv[1];
}
ofpbuf_init(&packet, strlen(buffer) / 2);
/* "encode-hello BITMAP...": Encodes each BITMAP as an OpenFlow hello message
* and dumps each message in hex. */
static void
-ofctl_encode_hello(int argc OVS_UNUSED, char *argv[])
+ofctl_encode_hello(struct ovs_cmdl_context *ctx)
{
- uint32_t bitmap = strtol(argv[1], NULL, 0);
+ uint32_t bitmap = strtol(ctx->argv[1], NULL, 0);
struct ofpbuf *hello;
hello = ofputil_encode_hello(bitmap);
projects / cascardo / ovs.git / blobdiff