X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ovsdb%2Fovsdb-client.c;h=37bd1aa2fcb408dfd919906139e786637b370be5;hb=077996afd9aabcbd29a5ca72629b01dcc2fb1793;hp=295a9be5fdb0ef54c534f18307e82e65fb33e6e7;hpb=8274ae959ac0b158c3e3206b3810af608fb93785;p=sliver-openvswitch.git diff --git a/ovsdb/ovsdb-client.c b/ovsdb/ovsdb-client.c index 295a9be5f..37bd1aa2f 100644 --- a/ovsdb/ovsdb-client.c +++ b/ovsdb/ovsdb-client.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010 Nicira Networks. + * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ #include -#include +#include #include #include #include @@ -29,13 +29,16 @@ #include "column.h" #include "compiler.h" #include "daemon.h" +#include "dirs.h" #include "dynamic-string.h" #include "json.h" #include "jsonrpc.h" +#include "lib/table.h" #include "ovsdb.h" #include "ovsdb-data.h" #include "ovsdb-error.h" #include "sort.h" +#include "svec.h" #include "stream.h" #include "stream-ssl.h" #include "table.h" @@ -45,39 +48,112 @@ VLOG_DEFINE_THIS_MODULE(ovsdb_client); -/* --format: Output formatting. */ -static enum { - FMT_TABLE, /* Textual table. */ - FMT_HTML, /* HTML table. */ - FMT_CSV, /* Comma-separated lines. */ - FMT_JSON /* JSON. */ -} output_format; +enum args_needed { + NEED_NONE, /* No JSON-RPC connection or database name needed. */ + NEED_RPC, /* JSON-RPC connection needed. */ + NEED_DATABASE /* JSON-RPC connection and database name needed. */ +}; -/* --no-headings: Whether table output should include headings. */ -static int output_headings = true; +struct ovsdb_client_command { + const char *name; + enum args_needed need; + int min_args; + int max_args; + void (*handler)(struct jsonrpc *rpc, const char *database, + int argc, char *argv[]); +}; -/* --pretty: Flags to pass to json_to_string(). */ -static int json_flags = JSSF_SORT; +/* --timestamp: Print a timestamp before each update on "monitor" command? */ +static bool timestamp; -/* --data: Format of data in output tables. */ -static enum { - DF_STRING, /* String format. */ - DF_JSON, /* JSON. */ -} data_format; +/* Format for table output. */ +static struct table_style table_style = TABLE_STYLE_DEFAULT; -static const struct command all_commands[]; +static const struct ovsdb_client_command all_commands[]; static void usage(void) NO_RETURN; static void parse_options(int argc, char *argv[]); +static struct jsonrpc *open_jsonrpc(const char *server); +static void fetch_dbs(struct jsonrpc *, struct svec *dbs); int main(int argc, char *argv[]) { + const struct ovsdb_client_command *command; + const char *database; + struct jsonrpc *rpc; + proctitle_init(argc, argv); set_program_name(argv[0]); parse_options(argc, argv); signal(SIGPIPE, SIG_IGN); - run_command(argc - optind, argv + optind, all_commands); + + if (optind >= argc) { + ovs_fatal(0, "missing command name; use --help for help"); + } + + for (command = all_commands; ; command++) { + if (!command->name) { + VLOG_FATAL("unknown command '%s'; use --help for help", + argv[optind]); + } else if (!strcmp(command->name, argv[optind])) { + break; + } + } + optind++; + + if (command->need != NEED_NONE) { + if (argc - optind > command->min_args + && (isalpha((unsigned char) argv[optind][0]) + && strchr(argv[optind], ':'))) { + rpc = open_jsonrpc(argv[optind++]); + } else { + char *sock = xasprintf("unix:%s/db.sock", ovs_rundir()); + rpc = open_jsonrpc(sock); + free(sock); + } + } else { + rpc = NULL; + } + + if (command->need == NEED_DATABASE) { + struct svec dbs; + + svec_init(&dbs); + fetch_dbs(rpc, &dbs); + if (argc - optind > command->min_args + && svec_contains(&dbs, argv[optind])) { + database = argv[optind++]; + } else if (dbs.n == 1) { + database = xstrdup(dbs.names[0]); + } else if (svec_contains(&dbs, "Open_vSwitch")) { + database = "Open_vSwitch"; + } else { + ovs_fatal(0, "no default database for `%s' command, please " + "specify a database name", command->name); + } + svec_destroy(&dbs); + } else { + database = NULL; + } + + if (argc - optind < command->min_args || + argc - optind > command->max_args) { + VLOG_FATAL("invalid syntax for '%s' (use --help for help)", + command->name); + } + + command->handler(rpc, database, argc - optind, argv + optind); + + jsonrpc_close(rpc); + + if (ferror(stdout)) { + VLOG_FATAL("write to stdout failed"); + } + if (ferror(stderr)) { + VLOG_FATAL("write to stderr failed"); + } + return 0; } @@ -86,22 +162,22 @@ parse_options(int argc, char *argv[]) { enum { OPT_BOOTSTRAP_CA_CERT = UCHAR_MAX + 1, + OPT_TIMESTAMP, DAEMON_OPTION_ENUMS, + TABLE_OPTION_ENUMS }; static struct option long_options[] = { - {"format", required_argument, 0, 'f'}, - {"data", required_argument, 0, 'd'}, - {"no-headings", no_argument, &output_headings, 0}, - {"pretty", no_argument, &json_flags, JSSF_PRETTY | JSSF_SORT}, - {"verbose", optional_argument, 0, 'v'}, - {"help", no_argument, 0, 'h'}, - {"version", no_argument, 0, 'V'}, + {"verbose", optional_argument, NULL, 'v'}, + {"help", no_argument, NULL, 'h'}, + {"version", no_argument, NULL, 'V'}, + {"timestamp", no_argument, NULL, OPT_TIMESTAMP}, DAEMON_LONG_OPTIONS, #ifdef HAVE_OPENSSL - {"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT}, - STREAM_SSL_LONG_OPTIONS + {"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT}, + STREAM_SSL_LONG_OPTIONS, #endif - {0, 0, 0, 0}, + TABLE_LONG_OPTIONS, + {NULL, 0, NULL, 0}, }; char *short_options = long_options_to_short_options(long_options); @@ -114,35 +190,11 @@ parse_options(int argc, char *argv[]) } switch (c) { - case 'f': - if (!strcmp(optarg, "table")) { - output_format = FMT_TABLE; - } else if (!strcmp(optarg, "html")) { - output_format = FMT_HTML; - } else if (!strcmp(optarg, "csv")) { - output_format = FMT_CSV; - } else if (!strcmp(optarg, "json")) { - output_format = FMT_JSON; - } else { - ovs_fatal(0, "unknown output format \"%s\"", optarg); - } - break; - - case 'd': - if (!strcmp(optarg, "string")) { - data_format = DF_STRING; - } else if (!strcmp(optarg, "json")) { - data_format = DF_JSON; - } else { - ovs_fatal(0, "unknown data format \"%s\"", optarg); - } - break; - case 'h': usage(); case 'V': - OVS_PRINT_VERSION(0, 0); + ovs_print_version(0, 0); exit(EXIT_SUCCESS); case 'v': @@ -151,13 +203,17 @@ parse_options(int argc, char *argv[]) DAEMON_OPTION_HANDLERS -#ifdef HAVE_OPENSSL + TABLE_OPTION_HANDLERS(&table_style) + STREAM_SSL_OPTION_HANDLERS case OPT_BOOTSTRAP_CA_CERT: stream_ssl_set_ca_cert_file(optarg, true); break; -#endif + + case OPT_TIMESTAMP: + timestamp = true; + break; case '?': exit(EXIT_FAILURE); @@ -179,34 +235,37 @@ usage(void) printf("%s: Open vSwitch database JSON-RPC client\n" "usage: %s [OPTIONS] COMMAND [ARG...]\n" "\nValid commands are:\n" - "\n list-dbs SERVER\n" + "\n list-dbs [SERVER]\n" " list databases available on SERVER\n" - "\n get-schema SERVER DATABASE\n" + "\n get-schema [SERVER] [DATABASE]\n" " retrieve schema for DATABASE from SERVER\n" - "\n get-schema-version SERVER DATABASE\n" + "\n get-schema-version [SERVER] [DATABASE]\n" " retrieve schema for DATABASE from SERVER and report only its\n" " version number on stdout\n" - "\n list-tables SERVER DATABASE\n" + "\n list-tables [SERVER] [DATABASE]\n" " list tables for DATABASE on SERVER\n" - "\n list-columns SERVER DATABASE [TABLE]\n" + "\n list-columns [SERVER] [DATABASE] [TABLE]\n" " list columns in TABLE (or all tables) in DATABASE on SERVER\n" - "\n transact SERVER TRANSACTION\n" + "\n transact [SERVER] TRANSACTION\n" " run TRANSACTION (a JSON array of operations) on SERVER\n" " and print the results as JSON on stdout\n" - "\n monitor SERVER DATABASE TABLE [COLUMN,...]...\n" + "\n monitor [SERVER] [DATABASE] TABLE [COLUMN,...]...\n" " monitor contents of COLUMNs in TABLE in DATABASE on SERVER.\n" " COLUMNs may include !initial, !insert, !delete, !modify\n" " to avoid seeing the specified kinds of changes.\n" - "\n dump SERVER DATABASE\n" - " dump contents of DATABASE on SERVER to stdout\n", - program_name, program_name); + "\n dump [SERVER] [DATABASE]\n" + " dump contents of DATABASE on SERVER to stdout\n" + "\nThe default SERVER is unix:%s/db.sock.\n" + "The default DATABASE is Open_vSwitch.\n", + program_name, program_name, ovs_rundir()); stream_usage("SERVER", true, true, true); printf("\nOutput formatting options:\n" " -f, --format=FORMAT set output formatting to FORMAT\n" " (\"table\", \"html\", \"csv\", " "or \"json\")\n" " --no-headings omit table heading row\n" - " --pretty pretty-print JSON in output"); + " --pretty pretty-print JSON in output\n" + " --timestamp timestamp \"monitor\" output"); daemon_usage(); vlog_usage(); printf("\nOther options:\n" @@ -215,6 +274,21 @@ usage(void) exit(EXIT_SUCCESS); } +static void +check_txn(int error, struct jsonrpc_msg **reply_) +{ + struct jsonrpc_msg *reply = *reply_; + + if (error) { + ovs_fatal(error, "transaction failed"); + } + + if (reply->error) { + ovs_fatal(error, "transaction returned error: %s", + json_to_string(reply->error, table_style.json_flags)); + } +} + static struct json * parse_json(const char *s) { @@ -231,11 +305,12 @@ open_jsonrpc(const char *server) struct stream *stream; int error; - error = stream_open_block(jsonrpc_stream_open(server, &stream), &stream); + error = stream_open_block(jsonrpc_stream_open(server, &stream, + DSCP_DEFAULT), &stream); if (error == EAFNOSUPPORT) { struct pstream *pstream; - error = jsonrpc_pstream_open(server, &pstream); + error = jsonrpc_pstream_open(server, &pstream, DSCP_DEFAULT); if (error) { ovs_fatal(error, "failed to connect or listen to \"%s\"", server); } @@ -257,7 +332,7 @@ open_jsonrpc(const char *server) static void print_json(struct json *json) { - char *string = json_to_string(json, json_flags); + char *string = json_to_string(json, table_style.json_flags); fputs(string, stdout); free(string); } @@ -278,490 +353,32 @@ check_ovsdb_error(struct ovsdb_error *error) } static struct ovsdb_schema * -fetch_schema_from_rpc(struct jsonrpc *rpc, const char *database) +fetch_schema(struct jsonrpc *rpc, const char *database) { struct jsonrpc_msg *request, *reply; struct ovsdb_schema *schema; - int error; request = jsonrpc_create_request("get_schema", json_array_create_1( json_string_create(database)), NULL); - error = jsonrpc_transact_block(rpc, request, &reply); - if (error) { - ovs_fatal(error, "transaction failed"); - } + check_txn(jsonrpc_transact_block(rpc, request, &reply), &reply); check_ovsdb_error(ovsdb_schema_from_json(reply->result, &schema)); jsonrpc_msg_destroy(reply); return schema; } -static struct ovsdb_schema * -fetch_schema(const char *server, const char *database) -{ - struct ovsdb_schema *schema; - struct jsonrpc *rpc; - - rpc = open_jsonrpc(server); - schema = fetch_schema_from_rpc(rpc, database); - jsonrpc_close(rpc); - - return schema; -} - -struct column { - char *heading; -}; - -struct cell { - /* Literal text. */ - char *text; - - /* JSON. */ - struct json *json; - const struct ovsdb_type *type; -}; - -static const char * -cell_to_text(const struct cell *cell_) -{ - struct cell *cell = (struct cell *) cell_; - if (!cell->text) { - if (cell->json) { - if (data_format == DF_JSON || !cell->type) { - cell->text = json_to_string(cell->json, JSSF_SORT); - } else if (data_format == DF_STRING) { - struct ovsdb_datum datum; - struct ovsdb_error *error; - struct ds s; - - error = ovsdb_datum_from_json(&datum, cell->type, cell->json, - NULL); - if (!error) { - ds_init(&s); - ovsdb_datum_to_string(&datum, cell->type, &s); - ovsdb_datum_destroy(&datum, cell->type); - cell->text = ds_steal_cstr(&s); - } else { - cell->text = json_to_string(cell->json, JSSF_SORT); - } - } else { - NOT_REACHED(); - } - } else { - cell->text = xstrdup(""); - } - } - - return cell->text; -} - -static void -cell_destroy(struct cell *cell) -{ - free(cell->text); - json_destroy(cell->json); -} - -struct table { - struct cell *cells; - struct column *columns; - size_t n_columns, allocated_columns; - size_t n_rows, allocated_rows; - size_t current_column; - char *caption; -}; - -static void -table_init(struct table *table) -{ - memset(table, 0, sizeof *table); -} - -static void -table_destroy(struct table *table) -{ - size_t i; - - for (i = 0; i < table->n_columns; i++) { - free(table->columns[i].heading); - } - free(table->columns); - - for (i = 0; i < table->n_columns * table->n_rows; i++) { - cell_destroy(&table->cells[i]); - } - free(table->cells); - - free(table->caption); -} - -static void -table_set_caption(struct table *table, char *caption) -{ - free(table->caption); - table->caption = caption; -} - -static void -table_add_column(struct table *table, const char *heading, ...) - PRINTF_FORMAT(2, 3); - static void -table_add_column(struct table *table, const char *heading, ...) -{ - struct column *column; - va_list args; - - assert(!table->n_rows); - if (table->n_columns >= table->allocated_columns) { - table->columns = x2nrealloc(table->columns, &table->allocated_columns, - sizeof *table->columns); - } - column = &table->columns[table->n_columns++]; - - va_start(args, heading); - column->heading = xvasprintf(heading, args); - va_end(args); -} - -static struct cell * -table_cell__(const struct table *table, size_t row, size_t column) -{ - return &table->cells[column + row * table->n_columns]; -} - -static void -table_add_row(struct table *table) -{ - size_t x, y; - - if (table->n_rows >= table->allocated_rows) { - table->cells = x2nrealloc(table->cells, &table->allocated_rows, - table->n_columns * sizeof *table->cells); - } - - y = table->n_rows++; - table->current_column = 0; - for (x = 0; x < table->n_columns; x++) { - struct cell *cell = table_cell__(table, y, x); - memset(cell, 0, sizeof *cell); - } -} - -static struct cell * -table_add_cell(struct table *table) -{ - size_t x, y; - - assert(table->n_rows > 0); - assert(table->current_column < table->n_columns); - - x = table->current_column++; - y = table->n_rows - 1; - - return table_cell__(table, y, x); -} - -static void -table_print_table_line__(struct ds *line) -{ - puts(ds_cstr(line)); - ds_clear(line); -} - -static void -table_print_table__(const struct table *table) -{ - static int n = 0; - struct ds line = DS_EMPTY_INITIALIZER; - int *widths; - size_t x, y; - - if (n++ > 0) { - putchar('\n'); - } - - if (table->caption) { - puts(table->caption); - } - - widths = xmalloc(table->n_columns * sizeof *widths); - for (x = 0; x < table->n_columns; x++) { - const struct column *column = &table->columns[x]; - - widths[x] = strlen(column->heading); - for (y = 0; y < table->n_rows; y++) { - const char *text = cell_to_text(table_cell__(table, y, x)); - size_t length = strlen(text); - - if (length > widths[x]) - widths[x] = length; - } - } - - if (output_headings) { - for (x = 0; x < table->n_columns; x++) { - const struct column *column = &table->columns[x]; - if (x) { - ds_put_char(&line, ' '); - } - ds_put_format(&line, "%-*s", widths[x], column->heading); - } - table_print_table_line__(&line); - - for (x = 0; x < table->n_columns; x++) { - if (x) { - ds_put_char(&line, ' '); - } - ds_put_char_multiple(&line, '-', widths[x]); - } - table_print_table_line__(&line); - } - - for (y = 0; y < table->n_rows; y++) { - for (x = 0; x < table->n_columns; x++) { - const char *text = cell_to_text(table_cell__(table, y, x)); - if (x) { - ds_put_char(&line, ' '); - } - ds_put_format(&line, "%-*s", widths[x], text); - } - table_print_table_line__(&line); - } - - ds_destroy(&line); - free(widths); -} - -static void -table_escape_html_text__(const char *s, size_t n) -{ - size_t i; - - for (i = 0; i < n; i++) { - char c = s[i]; - - switch (c) { - case '&': - fputs("&", stdout); - break; - case '<': - fputs("<", stdout); - break; - case '>': - fputs(">", stdout); - break; - case '"': - fputs(""", stdout); - break; - default: - putchar(c); - break; - } - } -} - -static void -table_print_html_cell__(const char *element, const char *content) -{ - const char *p; - - printf(" <%s>", element); - for (p = content; *p; ) { - struct uuid uuid; - - if (uuid_from_string_prefix(&uuid, p)) { - printf("%.*s", UUID_LEN, p, 8, p); - p += UUID_LEN; - } else { - table_escape_html_text__(p, 1); - p++; - } - } - printf("\n", element); -} - -static void -table_print_html__(const struct table *table) -{ - size_t x, y; - - fputs("\n", stdout); - - if (table->caption) { - table_print_html_cell__("caption", table->caption); - } - - if (output_headings) { - fputs(" \n", stdout); - for (x = 0; x < table->n_columns; x++) { - const struct column *column = &table->columns[x]; - table_print_html_cell__("th", column->heading); - } - fputs(" \n", stdout); - } - - for (y = 0; y < table->n_rows; y++) { - fputs(" \n", stdout); - for (x = 0; x < table->n_columns; x++) { - const char *content = cell_to_text(table_cell__(table, y, x)); - - if (!strcmp(table->columns[x].heading, "_uuid")) { - fputs(" \n", stdout); - } else { - table_print_html_cell__("td", content); - } - } - fputs(" \n", stdout); - } - - fputs("
", stdout); - table_escape_html_text__(content, 8); - fputs("
\n", stdout); -} - -static void -table_print_csv_cell__(const char *content) -{ - const char *p; - - if (!strpbrk(content, "\n\",")) { - fputs(content, stdout); - } else { - putchar('"'); - for (p = content; *p != '\0'; p++) { - switch (*p) { - case '"': - fputs("\"\"", stdout); - break; - default: - putchar(*p); - break; - } - } - putchar('"'); - } -} - -static void -table_print_csv__(const struct table *table) -{ - static int n = 0; - size_t x, y; - - if (n++ > 0) { - putchar('\n'); - } - - if (table->caption) { - puts(table->caption); - } - - if (output_headings) { - for (x = 0; x < table->n_columns; x++) { - const struct column *column = &table->columns[x]; - if (x) { - putchar(','); - } - table_print_csv_cell__(column->heading); - } - putchar('\n'); - } - - for (y = 0; y < table->n_rows; y++) { - for (x = 0; x < table->n_columns; x++) { - if (x) { - putchar(','); - } - table_print_csv_cell__(cell_to_text(table_cell__(table, y, x))); - } - putchar('\n'); - } -} - -static void -table_print_json__(const struct table *table) -{ - struct json *json, *headings, *data; - size_t x, y; - char *s; - - json = json_object_create(); - if (table->caption) { - json_object_put_string(json, "caption", table->caption); - } - - headings = json_array_create_empty(); - for (x = 0; x < table->n_columns; x++) { - const struct column *column = &table->columns[x]; - json_array_add(headings, json_string_create(column->heading)); - } - json_object_put(json, "headings", headings); - - data = json_array_create_empty(); - for (y = 0; y < table->n_rows; y++) { - struct json *row = json_array_create_empty(); - for (x = 0; x < table->n_columns; x++) { - const struct cell *cell = table_cell__(table, y, x); - if (cell->text) { - json_array_add(row, json_string_create(cell->text)); - } else { - json_array_add(row, json_clone(cell->json)); - } - } - json_array_add(data, row); - } - json_object_put(json, "data", data); - - s = json_to_string(json, json_flags); - json_destroy(json); - puts(s); - free(s); -} - -static void -table_print(const struct table *table) -{ - switch (output_format) { - case FMT_TABLE: - table_print_table__(table); - break; - - case FMT_HTML: - table_print_html__(table); - break; - - case FMT_CSV: - table_print_csv__(table); - break; - - case FMT_JSON: - table_print_json__(table); - break; - } -} - -static void -do_list_dbs(int argc OVS_UNUSED, char *argv[]) +fetch_dbs(struct jsonrpc *rpc, struct svec *dbs) { struct jsonrpc_msg *request, *reply; - struct jsonrpc *rpc; - int error; size_t i; - rpc = open_jsonrpc(argv[1]); request = jsonrpc_create_request("list_dbs", json_array_create_empty(), NULL); - error = jsonrpc_transact_block(rpc, request, &reply); - if (error) { - ovs_fatal(error, "transaction failed"); - } + check_txn(jsonrpc_transact_block(rpc, request, &reply), &reply); if (reply->result->type != JSON_ARRAY) { ovs_fatal(0, "list_dbs response is not array"); } @@ -772,35 +389,55 @@ do_list_dbs(int argc OVS_UNUSED, char *argv[]) if (name->type != JSON_STRING) { ovs_fatal(0, "list_dbs response %zu is not string", i); } - puts(name->u.string); + svec_add(dbs, name->u.string); } jsonrpc_msg_destroy(reply); } + +static void +do_list_dbs(struct jsonrpc *rpc, const char *database OVS_UNUSED, + int argc OVS_UNUSED, char *argv[] OVS_UNUSED) +{ + const char *db_name; + struct svec dbs; + size_t i; + + svec_init(&dbs); + fetch_dbs(rpc, &dbs); + svec_sort(&dbs); + SVEC_FOR_EACH (i, db_name, &dbs) { + puts(db_name); + } + svec_destroy(&dbs); +} static void -do_get_schema(int argc OVS_UNUSED, char *argv[]) +do_get_schema(struct jsonrpc *rpc, const char *database, + int argc OVS_UNUSED, char *argv[] OVS_UNUSED) { - struct ovsdb_schema *schema = fetch_schema(argv[1], argv[2]); + struct ovsdb_schema *schema = fetch_schema(rpc, database); print_and_free_json(ovsdb_schema_to_json(schema)); ovsdb_schema_destroy(schema); } static void -do_get_schema_version(int argc OVS_UNUSED, char *argv[]) +do_get_schema_version(struct jsonrpc *rpc, const char *database, + int argc OVS_UNUSED, char *argv[] OVS_UNUSED) { - struct ovsdb_schema *schema = fetch_schema(argv[1], argv[2]); + struct ovsdb_schema *schema = fetch_schema(rpc, database); puts(schema->version); ovsdb_schema_destroy(schema); } static void -do_list_tables(int argc OVS_UNUSED, char *argv[]) +do_list_tables(struct jsonrpc *rpc, const char *database, + int argc OVS_UNUSED, char *argv[] OVS_UNUSED) { struct ovsdb_schema *schema; struct shash_node *node; struct table t; - schema = fetch_schema(argv[1], argv[2]); + schema = fetch_schema(rpc, database); table_init(&t); table_add_column(&t, "Table"); SHASH_FOR_EACH (node, &schema->tables) { @@ -810,18 +447,19 @@ do_list_tables(int argc OVS_UNUSED, char *argv[]) table_add_cell(&t)->text = xstrdup(ts->name); } ovsdb_schema_destroy(schema); - table_print(&t); + table_print(&t, &table_style); } static void -do_list_columns(int argc OVS_UNUSED, char *argv[]) +do_list_columns(struct jsonrpc *rpc, const char *database, + int argc OVS_UNUSED, char *argv[]) { - const char *table_name = argv[3]; + const char *table_name = argv[0]; struct ovsdb_schema *schema; struct shash_node *table_node; struct table t; - schema = fetch_schema(argv[1], argv[2]); + schema = fetch_schema(rpc, database); table_init(&t); if (!table_name) { table_add_column(&t, "Table"); @@ -847,33 +485,23 @@ do_list_columns(int argc OVS_UNUSED, char *argv[]) } } ovsdb_schema_destroy(schema); - table_print(&t); + table_print(&t, &table_style); } static void -do_transact(int argc OVS_UNUSED, char *argv[]) +do_transact(struct jsonrpc *rpc, const char *database OVS_UNUSED, + int argc OVS_UNUSED, char *argv[]) { struct jsonrpc_msg *request, *reply; struct json *transaction; - struct jsonrpc *rpc; - int error; - transaction = parse_json(argv[2]); + transaction = parse_json(argv[0]); - rpc = open_jsonrpc(argv[1]); request = jsonrpc_create_request("transact", transaction, NULL); - error = jsonrpc_transact_block(rpc, request, &reply); - if (error) { - ovs_fatal(error, "transaction failed"); - } - if (reply->error) { - ovs_fatal(error, "transaction returned error: %s", - json_to_string(reply->error, json_flags)); - } + check_txn(jsonrpc_transact_block(rpc, request, &reply), &reply); print_json(reply->result); putchar('\n'); jsonrpc_msg_destroy(reply); - jsonrpc_close(rpc); } static void @@ -915,6 +543,7 @@ monitor_print(struct json *table_updates, size_t i; table_init(&t); + table_set_timestamp(&t, timestamp); if (table_updates->type != JSON_OBJECT) { ovs_error(0, " is not object"); @@ -955,7 +584,7 @@ monitor_print(struct json *table_updates, monitor_print_row(new, "new", "", columns, &t); } } - table_print(&t); + table_print(&t, &table_style); table_destroy(&t); } @@ -1041,22 +670,19 @@ parse_monitor_columns(char *arg, const char *server, const char *database, } static void -do_monitor(int argc, char *argv[]) +do_monitor(struct jsonrpc *rpc, const char *database, + int argc, char *argv[]) { - const char *server = argv[1]; - const char *database = argv[2]; - const char *table_name = argv[3]; + const char *server = jsonrpc_get_name(rpc); + const char *table_name = argv[0]; struct ovsdb_column_set columns = OVSDB_COLUMN_SET_INITIALIZER; struct ovsdb_table_schema *table; struct ovsdb_schema *schema; struct jsonrpc_msg *request; - struct jsonrpc *rpc; struct json *monitor, *monitor_request_array, *monitor_requests, *request_id; - rpc = open_jsonrpc(server); - - schema = fetch_schema_from_rpc(rpc, database); + schema = fetch_schema(rpc, database); table = shash_find_data(&schema->tables, table_name); if (!table) { ovs_fatal(0, "%s: %s does not have a table named \"%s\"", @@ -1064,10 +690,10 @@ do_monitor(int argc, char *argv[]) } monitor_request_array = json_array_create_empty(); - if (argc > 4) { + if (argc > 1) { int i; - for (i = 4; i < argc; i++) { + for (i = 1; i < argc; i++) { json_array_add( monitor_request_array, parse_monitor_columns(argv[i], server, database, table, @@ -1108,12 +734,8 @@ do_monitor(int argc, char *argv[]) monitor_print(msg->result, table, &columns, true); fflush(stdout); if (get_detach()) { - /* daemonize() closes the standard file descriptors. We output - * to stdout, so we need to save and restore STDOUT_FILENO. */ - int fd = dup(STDOUT_FILENO); + daemon_save_fd(STDOUT_FILENO); daemonize(); - dup2(fd, STDOUT_FILENO); - close(fd); } } else if (msg->type == JSONRPC_NOTIFY && !strcmp(msg->method, "update")) { @@ -1264,32 +886,31 @@ dump_table(const struct ovsdb_table_schema *ts, struct json_array *rows) struct cell *cell = table_add_cell(&t); cell->json = ovsdb_datum_to_json(&data[y][x], &columns[x]->type); cell->type = &columns[x]->type; + ovsdb_datum_destroy(&data[y][x], &columns[x]->type); } + free(data[y]); } - table_print(&t); + table_print(&t, &table_style); table_destroy(&t); + + free(data); + free(columns); } static void -do_dump(int argc OVS_UNUSED, char *argv[]) +do_dump(struct jsonrpc *rpc, const char *database, + int argc OVS_UNUSED, char *argv[] OVS_UNUSED) { - const char *server = argv[1]; - const char *database = argv[2]; - struct jsonrpc_msg *request, *reply; struct ovsdb_schema *schema; struct json *transaction; - struct jsonrpc *rpc; - int error; const struct shash_node **tables; size_t n_tables; size_t i; - rpc = open_jsonrpc(server); - - schema = fetch_schema_from_rpc(rpc, database); + schema = fetch_schema(rpc, database); tables = shash_sort(&schema->tables); n_tables = shash_count(&schema->tables); @@ -1319,10 +940,7 @@ do_dump(int argc OVS_UNUSED, char *argv[]) /* Send request, get reply. */ request = jsonrpc_create_request("transact", transaction, NULL); - error = jsonrpc_transact_block(rpc, request, &reply); - if (error) { - ovs_fatal(error, "transaction failed"); - } + check_txn(jsonrpc_transact_block(rpc, request, &reply), &reply); /* Print database contents. */ if (reply->result->type != JSON_ARRAY @@ -1345,23 +963,37 @@ do_dump(int argc OVS_UNUSED, char *argv[]) dump_table(ts, &rows->u.array); } + + jsonrpc_msg_destroy(reply); + free(tables); + ovsdb_schema_destroy(schema); } static void -do_help(int argc OVS_UNUSED, char *argv[] OVS_UNUSED) +do_help(struct jsonrpc *rpc OVS_UNUSED, const char *database OVS_UNUSED, + int argc OVS_UNUSED, char *argv[] OVS_UNUSED) { usage(); } -static const struct command all_commands[] = { - { "list-dbs", 1, 1, do_list_dbs }, - { "get-schema", 2, 2, do_get_schema }, - { "get-schema-version", 2, 2, do_get_schema_version }, - { "list-tables", 2, 2, do_list_tables }, - { "list-columns", 2, 3, do_list_columns }, - { "transact", 2, 2, do_transact }, - { "monitor", 3, INT_MAX, do_monitor }, - { "dump", 2, 2, do_dump }, - { "help", 0, INT_MAX, do_help }, - { NULL, 0, 0, NULL }, +/* All command handlers (except for "help") are expected to take an optional + * server socket name (e.g. "unix:...") as their first argument. The socket + * name argument must be included in max_args (but left out of min_args). The + * command name and socket name are not included in the arguments passed to the + * handler: the argv[0] passed to the handler is the first argument after the + * optional server socket name. The connection to the server is available as + * global variable 'rpc'. */ +static const struct ovsdb_client_command all_commands[] = { + { "list-dbs", NEED_RPC, 0, 0, do_list_dbs }, + { "get-schema", NEED_DATABASE, 0, 0, do_get_schema }, + { "get-schema-version", NEED_DATABASE, 0, 0, do_get_schema_version }, + { "list-tables", NEED_DATABASE, 0, 0, do_list_tables }, + { "list-columns", NEED_DATABASE, 0, 1, do_list_columns }, + { "transact", NEED_RPC, 1, 1, do_transact }, + { "monitor", NEED_DATABASE, 1, INT_MAX, do_monitor }, + { "dump", NEED_DATABASE, 0, 0, do_dump }, + + { "help", NEED_NONE, 0, INT_MAX, do_help }, + + { NULL, 0, 0, 0, NULL }, };