X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utilities%2Fovs-vsctl.c;h=940866449f6180be9301920e0f10c98a869374d8;hb=c424adb3ac3460818256181a073b09e92cdc562a;hp=4d50194aaa33a4fb8eef0d40e05cb968269aee27;hpb=a2a9d2d9df6fdc80438760b7e343baba7dcc817d;p=openvswitch diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c index 4d50194a..94086644 100644 --- a/utilities/ovs-vsctl.c +++ b/utilities/ovs-vsctl.c @@ -59,6 +59,7 @@ struct vsctl_command_syntax { vsctl_handler_func *run; vsctl_handler_func *postprocess; const char *options; + enum { RO, RW } mode; /* Does this command modify the database? */ }; struct vsctl_command { @@ -85,7 +86,7 @@ static bool dry_run; static bool wait_for_reload = true; /* --timeout: Time to wait for a connection to 'db'. */ -static int timeout = 5; +static int timeout; /* All supported commands. */ static const struct vsctl_command_syntax all_commands[]; @@ -101,10 +102,12 @@ static void vsctl_fatal(const char *, ...) PRINTF_FORMAT(1, 2) NO_RETURN; static char *default_db(void); static void usage(void) NO_RETURN; static void parse_options(int argc, char *argv[]); +static bool might_write_to_db(char **argv); static struct vsctl_command *parse_commands(int argc, char *argv[], size_t *n_commandsp); static void parse_command(int argc, char *argv[], struct vsctl_command *); +static const struct vsctl_command_syntax *find_command(const char *name); static void do_vsctl(const char *args, struct vsctl_command *, size_t n_commands, struct ovsdb_idl *); @@ -114,7 +117,6 @@ static void set_column(const struct vsctl_table_class *, const struct ovsdb_idl_row *, const char *arg, struct ovsdb_symbol_table *); - int main(int argc, char *argv[]) { @@ -132,7 +134,7 @@ main(int argc, char *argv[]) /* Log our arguments. This is often valuable for debugging systems. */ args = process_escape_args(argv); - VLOG_INFO("Called as %s", args); + VLOG(might_write_to_db(argv) ? VLL_INFO : VLL_DBG, "Called as %s", args); /* Parse command line. */ parse_options(argc, argv); @@ -295,6 +297,8 @@ static void parse_command(int argc, char *argv[], struct vsctl_command *command) { const struct vsctl_command_syntax *p; + struct shash_node *node; + int n_arg; int i; shash_init(&command->options); @@ -325,58 +329,71 @@ parse_command(int argc, char *argv[], struct vsctl_command *command) vsctl_fatal("missing command name"); } - for (p = all_commands; p->name; p++) { - if (!strcmp(p->name, argv[i])) { - struct shash_node *node; - int n_arg; + p = find_command(argv[i]); + if (!p) { + vsctl_fatal("unknown command '%s'; use --help for help", argv[i]); + } - SHASH_FOR_EACH (node, &command->options) { - const char *s = strstr(p->options, node->name); - int end = s ? s[strlen(node->name)] : EOF; + SHASH_FOR_EACH (node, &command->options) { + const char *s = strstr(p->options, node->name); + int end = s ? s[strlen(node->name)] : EOF; - if (end != '=' && end != ',' && end != ' ' && end != '\0') { - vsctl_fatal("'%s' command has no '%s' option", - argv[i], node->name); - } - if ((end == '=') != (node->data != NULL)) { - if (end == '=') { - vsctl_fatal("missing argument to '%s' option on '%s' " - "command", node->name, argv[i]); - } else { - vsctl_fatal("'%s' option on '%s' does not accept an " - "argument", node->name, argv[i]); - } - } + if (end != '=' && end != ',' && end != ' ' && end != '\0') { + vsctl_fatal("'%s' command has no '%s' option", + argv[i], node->name); + } + if ((end == '=') != (node->data != NULL)) { + if (end == '=') { + vsctl_fatal("missing argument to '%s' option on '%s' " + "command", node->name, argv[i]); + } else { + vsctl_fatal("'%s' option on '%s' does not accept an " + "argument", node->name, argv[i]); } + } + } - n_arg = argc - i - 1; - if (n_arg < p->min_args) { - vsctl_fatal("'%s' command requires at least %d arguments", - p->name, p->min_args); - } else if (n_arg > p->max_args) { - int j; - - for (j = i + 1; j < argc; j++) { - if (argv[j][0] == '-') { - vsctl_fatal("'%s' command takes at most %d arguments " - "(note that options must precede command " - "names and follow a \"--\" argument)", - p->name, p->max_args); - } - } + n_arg = argc - i - 1; + if (n_arg < p->min_args) { + vsctl_fatal("'%s' command requires at least %d arguments", + p->name, p->min_args); + } else if (n_arg > p->max_args) { + int j; - vsctl_fatal("'%s' command takes at most %d arguments", + for (j = i + 1; j < argc; j++) { + if (argv[j][0] == '-') { + vsctl_fatal("'%s' command takes at most %d arguments " + "(note that options must precede command " + "names and follow a \"--\" argument)", p->name, p->max_args); - } else { - command->syntax = p; - command->argc = n_arg + 1; - command->argv = &argv[i]; - return; } } + + vsctl_fatal("'%s' command takes at most %d arguments", + p->name, p->max_args); } - vsctl_fatal("unknown command '%s'; use --help for help", argv[i]); + command->syntax = p; + command->argc = n_arg + 1; + command->argv = &argv[i]; +} + +/* Returns the "struct vsctl_command_syntax" for a given command 'name', or a + * null pointer if there is none. */ +static const struct vsctl_command_syntax * +find_command(const char *name) +{ + static struct shash commands = SHASH_INITIALIZER(&commands); + + if (shash_is_empty(&commands)) { + const struct vsctl_command_syntax *p; + + for (p = all_commands; p->name; p++) { + shash_add_assert(&commands, p->name, p); + } + } + + return shash_find_data(&commands, name); } static void @@ -494,6 +511,21 @@ default_db(void) } return def; } + +/* Returns true if it looks like this set of arguments might modify the + * database, otherwise false. (Not very smart, so it's prone to false + * positives.) */ +static bool +might_write_to_db(char **argv) +{ + for (; *argv; argv++) { + const struct vsctl_command_syntax *p = find_command(*argv); + if (p && p->mode == RW) { + return true; + } + } + return false; +} struct vsctl_context { /* Read-only. */ @@ -1305,12 +1337,11 @@ add_port(struct vsctl_context *ctx, get_info(ctx->ovs, &info); if (may_exist) { - struct vsctl_port *port; + struct vsctl_port *vsctl_port; - port = find_port(&info, port_name, false); - if (port) { + vsctl_port = find_port(&info, port_name, false); + if (vsctl_port) { struct svec want_names, have_names; - size_t i; svec_init(&want_names); for (i = 0; i < n_ifaces; i++) { @@ -1319,15 +1350,16 @@ add_port(struct vsctl_context *ctx, svec_sort(&want_names); svec_init(&have_names); - for (i = 0; i < port->port_cfg->n_interfaces; i++) { - svec_add(&have_names, port->port_cfg->interfaces[i]->name); + for (i = 0; i < vsctl_port->port_cfg->n_interfaces; i++) { + svec_add(&have_names, + vsctl_port->port_cfg->interfaces[i]->name); } svec_sort(&have_names); - if (strcmp(port->bridge->name, br_name)) { + if (strcmp(vsctl_port->bridge->name, br_name)) { char *command = vsctl_context_to_string(ctx); vsctl_fatal("\"%s\" but %s is actually attached to bridge %s", - command, port_name, port->bridge->name); + command, port_name, vsctl_port->bridge->name); } if (!svec_equal(&want_names, &have_names)) { @@ -1975,6 +2007,28 @@ get_column(const struct vsctl_table_class *table, const char *column_name, } } +static struct uuid * +create_symbol(struct ovsdb_symbol_table *symtab, const char *id, bool *newp) +{ + struct ovsdb_symbol *symbol; + + if (id[0] != '@') { + vsctl_fatal("row id \"%s\" does not begin with \"@\"", id); + } + + if (newp) { + *newp = ovsdb_symbol_table_get(symtab, id) == NULL; + } + + symbol = ovsdb_symbol_table_insert(symtab, id); + if (symbol->used) { + vsctl_fatal("row id \"%s\" may only be specified on one --id option", + id); + } + symbol->used = true; + return &symbol->uuid; +} + static char * missing_operator_error(const char *arg, const char **allowed_operators, size_t n_allowed) @@ -2142,6 +2196,7 @@ error: static void cmd_get(struct vsctl_context *ctx) { + const char *id = shash_find_data(&ctx->options, "--id"); bool if_exists = shash_find(&ctx->options, "--if-exists"); const char *table_name = ctx->argv[1]; const char *record_id = ctx->argv[2]; @@ -2152,6 +2207,15 @@ cmd_get(struct vsctl_context *ctx) table = get_table(table_name); row = must_get_row(ctx, table, record_id); + if (id) { + bool new; + + *create_symbol(ctx->symtab, id, &new) = row->uuid; + if (!new) { + vsctl_fatal("row id \"%s\" specified on \"get\" command was used " + "before it was defined", id); + } + } for (i = 3; i < ctx->argc; i++) { const struct ovsdb_idl_column *column; const struct ovsdb_datum *datum; @@ -2453,24 +2517,7 @@ cmd_create(struct vsctl_context *ctx) const struct uuid *uuid; int i; - if (id) { - struct ovsdb_symbol *symbol; - - if (id[0] != '@') { - vsctl_fatal("row id \"%s\" does not begin with \"@\"", id); - } - - symbol = ovsdb_symbol_table_insert(ctx->symtab, id); - if (symbol->used) { - vsctl_fatal("row id \"%s\" may only be used to insert a single " - "row", id); - } - symbol->used = true; - - uuid = &symbol->uuid; - } else { - uuid = NULL; - } + uuid = id ? create_symbol(ctx->symtab, id, NULL) : NULL; table = get_table(table_name); row = ovsdb_idl_txn_insert(ctx->txn, table->class, uuid); @@ -2767,8 +2814,8 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, ds_chomp(ds, '\n'); for (j = 0; j < ds->length; j++) { - int c = ds->string[j]; - switch (c) { + int ch = ds->string[j]; + switch (ch) { case '\n': fputs("\\n", stdout); break; @@ -2778,7 +2825,7 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, break; default: - putchar(c); + putchar(ch); } } putchar('\n'); @@ -2796,8 +2843,6 @@ do_vsctl(const char *args, struct vsctl_command *commands, size_t n_commands, if (wait_for_reload && status != TXN_UNCHANGED) { for (;;) { - const struct ovsrec_open_vswitch *ovs; - ovsdb_idl_run(idl); OVSREC_OPEN_VSWITCH_FOR_EACH (ovs, idl) { if (ovs->cur_cfg >= next_cfg) { @@ -2827,56 +2872,56 @@ try_again: static const struct vsctl_command_syntax all_commands[] = { /* Open vSwitch commands. */ - {"init", 0, 0, cmd_init, NULL, ""}, + {"init", 0, 0, cmd_init, NULL, "", RW}, /* Bridge commands. */ - {"add-br", 1, 3, cmd_add_br, NULL, "--may-exist"}, - {"del-br", 1, 1, cmd_del_br, NULL, "--if-exists"}, - {"list-br", 0, 0, cmd_list_br, NULL, ""}, - {"br-exists", 1, 1, cmd_br_exists, NULL, ""}, - {"br-to-vlan", 1, 1, cmd_br_to_vlan, NULL, ""}, - {"br-to-parent", 1, 1, cmd_br_to_parent, NULL, ""}, - {"br-set-external-id", 2, 3, cmd_br_set_external_id, NULL, ""}, - {"br-get-external-id", 1, 2, cmd_br_get_external_id, NULL, ""}, + {"add-br", 1, 3, cmd_add_br, NULL, "--may-exist", RW}, + {"del-br", 1, 1, cmd_del_br, NULL, "--if-exists", RW}, + {"list-br", 0, 0, cmd_list_br, NULL, "", RO}, + {"br-exists", 1, 1, cmd_br_exists, NULL, "", RO}, + {"br-to-vlan", 1, 1, cmd_br_to_vlan, NULL, "", RO}, + {"br-to-parent", 1, 1, cmd_br_to_parent, NULL, "", RO}, + {"br-set-external-id", 2, 3, cmd_br_set_external_id, NULL, "", RW}, + {"br-get-external-id", 1, 2, cmd_br_get_external_id, NULL, "", RO}, /* Port commands. */ - {"list-ports", 1, 1, cmd_list_ports, NULL, ""}, - {"add-port", 2, INT_MAX, cmd_add_port, NULL, "--may-exist"}, - {"add-bond", 4, INT_MAX, cmd_add_bond, NULL, "--may-exist,--fake-iface"}, - {"del-port", 1, 2, cmd_del_port, NULL, "--if-exists,--with-iface"}, - {"port-to-br", 1, 1, cmd_port_to_br, NULL, ""}, + {"list-ports", 1, 1, cmd_list_ports, NULL, "", RO}, + {"add-port", 2, INT_MAX, cmd_add_port, NULL, "--may-exist", RW}, + {"add-bond", 4, INT_MAX, cmd_add_bond, NULL, "--may-exist,--fake-iface", RW}, + {"del-port", 1, 2, cmd_del_port, NULL, "--if-exists,--with-iface", RW}, + {"port-to-br", 1, 1, cmd_port_to_br, NULL, "", RO}, /* Interface commands. */ - {"list-ifaces", 1, 1, cmd_list_ifaces, NULL, ""}, - {"iface-to-br", 1, 1, cmd_iface_to_br, NULL, ""}, + {"list-ifaces", 1, 1, cmd_list_ifaces, NULL, "", RO}, + {"iface-to-br", 1, 1, cmd_iface_to_br, NULL, "", RO}, /* Controller commands. */ - {"get-controller", 1, 1, cmd_get_controller, NULL, ""}, - {"del-controller", 1, 1, cmd_del_controller, NULL, ""}, - {"set-controller", 1, INT_MAX, cmd_set_controller, NULL, ""}, - {"get-fail-mode", 1, 1, cmd_get_fail_mode, NULL, ""}, - {"del-fail-mode", 1, 1, cmd_del_fail_mode, NULL, ""}, - {"set-fail-mode", 2, 2, cmd_set_fail_mode, NULL, ""}, + {"get-controller", 1, 1, cmd_get_controller, NULL, "", RO}, + {"del-controller", 1, 1, cmd_del_controller, NULL, "", RW}, + {"set-controller", 1, INT_MAX, cmd_set_controller, NULL, "", RW}, + {"get-fail-mode", 1, 1, cmd_get_fail_mode, NULL, "", RO}, + {"del-fail-mode", 1, 1, cmd_del_fail_mode, NULL, "", RW}, + {"set-fail-mode", 2, 2, cmd_set_fail_mode, NULL, "", RW}, /* SSL commands. */ - {"get-ssl", 0, 0, cmd_get_ssl, NULL, ""}, - {"del-ssl", 0, 0, cmd_del_ssl, NULL, ""}, - {"set-ssl", 3, 3, cmd_set_ssl, NULL, "--bootstrap"}, + {"get-ssl", 0, 0, cmd_get_ssl, NULL, "", RO}, + {"del-ssl", 0, 0, cmd_del_ssl, NULL, "", RW}, + {"set-ssl", 3, 3, cmd_set_ssl, NULL, "--bootstrap", RW}, /* Switch commands. */ - {"emer-reset", 0, 0, cmd_emer_reset, NULL, ""}, + {"emer-reset", 0, 0, cmd_emer_reset, NULL, "", RW}, /* Parameter commands. */ - {"get", 3, INT_MAX, cmd_get, NULL, "--if-exists"}, - {"list", 1, INT_MAX, cmd_list, NULL, ""}, - {"set", 3, INT_MAX, cmd_set, NULL, ""}, - {"add", 4, INT_MAX, cmd_add, NULL, ""}, - {"remove", 4, INT_MAX, cmd_remove, NULL, ""}, - {"clear", 3, INT_MAX, cmd_clear, NULL, ""}, - {"create", 2, INT_MAX, cmd_create, post_create, "--id="}, - {"destroy", 1, INT_MAX, cmd_destroy, NULL, "--if-exists"}, - {"wait-until", 2, INT_MAX, cmd_wait_until, NULL, ""}, - - {NULL, 0, 0, NULL, NULL, NULL}, + {"get", 2, INT_MAX, cmd_get, NULL, "--if-exists,--id=", RO}, + {"list", 1, INT_MAX, cmd_list, NULL, "", RO}, + {"set", 3, INT_MAX, cmd_set, NULL, "", RW}, + {"add", 4, INT_MAX, cmd_add, NULL, "", RW}, + {"remove", 4, INT_MAX, cmd_remove, NULL, "", RW}, + {"clear", 3, INT_MAX, cmd_clear, NULL, "", RW}, + {"create", 2, INT_MAX, cmd_create, post_create, "--id=", RW}, + {"destroy", 1, INT_MAX, cmd_destroy, NULL, "--if-exists", RW}, + {"wait-until", 2, INT_MAX, cmd_wait_until, NULL, "", RO}, + + {NULL, 0, 0, NULL, NULL, NULL, RO}, };