git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
openflow-1.1+: OFPT_TABLE_MOD (part 1)
[sliver-openvswitch.git]
/
utilities
/
ovs-dpctl.c
diff --git
a/utilities/ovs-dpctl.c
b/utilities/ovs-dpctl.c
index
a87a305
..
0516d1b
100644
(file)
--- a/
utilities/ovs-dpctl.c
+++ b/
utilities/ovs-dpctl.c
@@
-66,7
+66,7
@@
static bool may_create;
* the option itself. */
static int verbosity;
* the option itself. */
static int verbosity;
-static const struct command
all_commands[]
;
+static const struct command
*get_all_commands(void)
;
static void usage(void) NO_RETURN;
static void parse_options(int argc, char *argv[]);
static void usage(void) NO_RETURN;
static void parse_options(int argc, char *argv[]);
@@
-77,7
+77,7
@@
main(int argc, char *argv[])
set_program_name(argv[0]);
parse_options(argc, argv);
signal(SIGPIPE, SIG_IGN);
set_program_name(argv[0]);
parse_options(argc, argv);
signal(SIGPIPE, SIG_IGN);
- run_command(argc - optind, argv + optind,
all_commands
);
+ run_command(argc - optind, argv + optind,
get_all_commands()
);
return 0;
}
return 0;
}
@@
-182,6
+182,8
@@
usage(void)
vlog_usage();
printf("\nOptions for show and mod-flow:\n"
" -s, --statistics print statistics for port or flow\n"
vlog_usage();
printf("\nOptions for show and mod-flow:\n"
" -s, --statistics print statistics for port or flow\n"
+ "\nOptions for dump-flows:\n"
+ " -m, --more increase verbosity of output\n"
"\nOptions for mod-flow:\n"
" --may-create create flow if it doesn't exist\n"
" --clear reset existing stats to zero\n"
"\nOptions for mod-flow:\n"
" --may-create create flow if it doesn't exist\n"
" --clear reset existing stats to zero\n"
@@
-590,13
+592,13
@@
show_dpif(struct dpif *dpif)
free(nodes);
} else {
printf(", could not retrieve configuration (%s)",
free(nodes);
} else {
printf(", could not retrieve configuration (%s)",
- strerror(error));
+
ovs_
strerror(error));
}
smap_destroy(&config);
netdev_close(netdev);
} else {
}
smap_destroy(&config);
netdev_close(netdev);
} else {
- printf(": open failed (%s)", strerror(error));
+ printf(": open failed (%s)",
ovs_
strerror(error));
}
putchar(')');
}
}
putchar(')');
}
@@
-608,12
+610,12
@@
show_dpif(struct dpif *dpif)
error = netdev_open(dpif_port.name, dpif_port.type, &netdev);
if (error) {
error = netdev_open(dpif_port.name, dpif_port.type, &netdev);
if (error) {
- printf(", open failed (%s)", strerror(error));
+ printf(", open failed (%s)",
ovs_
strerror(error));
continue;
}
error = netdev_get_stats(netdev, &s);
if (error) {
continue;
}
error = netdev_get_stats(netdev, &s);
if (error) {
- printf(", could not retrieve stats (%s)", strerror(error));
+ printf(", could not retrieve stats (%s)",
ovs_
strerror(error));
continue;
}
continue;
}
@@
-761,7
+763,7
@@
dpctl_dump_flows(int argc, char *argv[])
&mask, &mask_len,
&actions, &actions_len, &stats)) {
ds_clear(&ds);
&mask, &mask_len,
&actions, &actions_len, &stats)) {
ds_clear(&ds);
- odp_flow_format(key, key_len, mask, mask_len, &ds);
+ odp_flow_format(key, key_len, mask, mask_len, &ds
, verbosity
);
ds_put_cstr(&ds, ", ");
dpif_flow_stats_format(stats, &ds);
ds_put_cstr(&ds, ", ");
dpif_flow_stats_format(stats, &ds);
@@
-997,7
+999,8
@@
sort_output_actions(struct nlattr *actions, size_t length)
}
if (first_output) {
uint8_t *end = (uint8_t *) actions + length;
}
if (first_output) {
uint8_t *end = (uint8_t *) actions + length;
- sort_output_actions__(first_output, (struct nlattr *) end);
+ sort_output_actions__(first_output,
+ ALIGNED_CAST(struct nlattr *, end));
}
}
}
}
@@
-1049,7
+1052,7
@@
dpctl_normalize_actions(int argc, char *argv[])
"odp_flow_key_from_string");
ds_clear(&s);
"odp_flow_key_from_string");
ds_clear(&s);
- odp_flow_format(keybuf.data, keybuf.size, NULL, 0, &s);
+ odp_flow_format(keybuf.data, keybuf.size, NULL, 0, &s
, verbosity
);
printf("input flow: %s\n", ds_cstr(&s));
run(odp_flow_key_to_flow(keybuf.data, keybuf.size, &flow),
printf("input flow: %s\n", ds_cstr(&s));
run(odp_flow_key_to_flow(keybuf.data, keybuf.size, &flow),
@@
-1146,3
+1149,8
@@
static const struct command all_commands[] = {
{ NULL, 0, 0, NULL },
};
{ NULL, 0, 0, NULL },
};
+
+static const struct command *get_all_commands(void)
+{
+ return all_commands;
+}