mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-31 14:25:26 +00:00
Code Issues Releases Wiki Activity

Add read-only option to ovs-dpctl and ovs-ofctl commands.

Browse Source 
ovs-dpctl and ovs-ofctl lack a read-only option to prevent
running of commands that perform read-write operations.  Add
it and the necessary scaffolding to each.

Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
This commit is contained in:
Ryan Moats
2016-08-15 18:47:29 +00:00
committed by Ben Pfaff
parent 239fa5bbe6
commit 1f4a7252d9
23 changed files with 320 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
lib/command-line.c
View File

@@ -87,20 +87,10 @@ ovs_cmdl_print_options(const struct option options[])
ds_destroy(&ds);
}
/* Runs the command designated by argv[0] within the command table specified by
* 'commands', which must be terminated by a command whose 'name' member is a
* null pointer.
*
* Command-line options should be stripped off, so that a typical invocation
* looks like:
* struct ovs_cmdl_context ctx = {
* .argc = argc - optind,
* .argv = argv + optind,
* };
* ovs_cmdl_run_command(&ctx, my_commands);
* */
void
ovs_cmdl_run_command(struct ovs_cmdl_context *ctx, const struct ovs_cmdl_command commands[])
static void
ovs_cmdl_run_command__(struct ovs_cmdl_context *ctx,
const struct ovs_cmdl_command commands[],
bool read_only)
{
const struct ovs_cmdl_command *p;
@@ -118,6 +108,10 @@ ovs_cmdl_run_command(struct ovs_cmdl_context *ctx, const struct ovs_cmdl_command
VLOG_FATAL("'%s' command takes at most %d arguments",
p->name, p->max_args);
} else {
if (p->mode == OVS_RW && read_only) {
VLOG_FATAL("'%s' command does not work in read only mode",
p->name);
}
p->handler(ctx);
if (ferror(stdout)) {
VLOG_FATAL("write to stdout failed");
@@ -132,6 +126,32 @@ ovs_cmdl_run_command(struct ovs_cmdl_context *ctx, const struct ovs_cmdl_command
VLOG_FATAL("unknown command '%s'; use --help for help", ctx->argv[0]);
}
/* Runs the command designated by argv[0] within the command table specified by
* 'commands', which must be terminated by a command whose 'name' member is a
* null pointer.
*
* Command-line options should be stripped off, so that a typical invocation
* looks like:
* struct ovs_cmdl_context ctx = {
* .argc = argc - optind,
* .argv = argv + optind,
* };
* ovs_cmdl_run_command(&ctx, my_commands);
* */
void
ovs_cmdl_run_command(struct ovs_cmdl_context *ctx,
const struct ovs_cmdl_command commands[])
{
ovs_cmdl_run_command__(ctx, commands, false);
}
void
ovs_cmdl_run_command_read_only(struct ovs_cmdl_context *ctx,
const struct ovs_cmdl_command commands[])
{
ovs_cmdl_run_command__(ctx, commands, true);
}
/* Process title. */