X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ovsdb%2Fovsdb-server.c;h=5477e8680b979bd7ba51a91e83ab1d57b9862814;hb=04a85497b994b0cb1c702d4ff8b0d2149767ae0e;hp=fac78c80785c02472bd8a5e38dc425a6fe621ca5;hpb=88b649747b690a899f9aae78de6f16690fac1a0c;p=openvswitch diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c index fac78c80..5477e868 100644 --- a/ovsdb/ovsdb-server.c +++ b/ovsdb/ovsdb-server.c @@ -40,7 +40,7 @@ #include "stream-ssl.h" #include "stream.h" #include "stress.h" -#include "svec.h" +#include "sset.h" #include "table.h" #include "timeval.h" #include "transaction.h" @@ -51,28 +51,26 @@ VLOG_DEFINE_THIS_MODULE(ovsdb_server); -#if HAVE_OPENSSL /* SSL configuration. */ static char *private_key_file; static char *certificate_file; static char *ca_cert_file; static bool bootstrap_ca_cert; -#endif static unixctl_cb_func ovsdb_server_exit; static unixctl_cb_func ovsdb_server_compact; static unixctl_cb_func ovsdb_server_reconnect; static void parse_options(int argc, char *argv[], char **file_namep, - struct shash *remotes, char **unixctl_pathp, + struct sset *remotes, char **unixctl_pathp, char **run_command); static void usage(void) NO_RETURN; static void reconfigure_from_db(struct ovsdb_jsonrpc_server *jsonrpc, - const struct ovsdb *db, struct shash *remotes); + const struct ovsdb *db, struct sset *remotes); static void update_remote_status(const struct ovsdb_jsonrpc_server *jsonrpc, - const struct shash *remotes, + const struct sset *remotes, struct ovsdb *db); int @@ -82,7 +80,7 @@ main(int argc, char *argv[]) char *run_command = NULL; struct unixctl_server *unixctl; struct ovsdb_jsonrpc_server *jsonrpc; - struct shash remotes; + struct sset remotes; struct ovsdb_error *error; struct ovsdb_file *file; struct ovsdb *db; @@ -101,7 +99,6 @@ main(int argc, char *argv[]) parse_options(argc, argv, &file_name, &remotes, &unixctl_path, &run_command); - die_if_already_running(); daemonize_start(); error = ovsdb_file_open(file_name, false, &db, &file); @@ -171,7 +168,7 @@ main(int argc, char *argv[]) } ovsdb_jsonrpc_server_destroy(jsonrpc); ovsdb_destroy(db); - shash_destroy_free_data(&remotes); + sset_destroy(&remotes); unixctl_server_destroy(unixctl); if (run_process && process_exited(run_process)) { @@ -347,7 +344,7 @@ read_string_column(const struct ovsdb_row *row, const char *column_name, const union ovsdb_atom *atom; atom = read_column(row, column_name, OVSDB_TYPE_STRING); - *stringp = atom ? atom->string : 0; + *stringp = atom ? atom->string : NULL; return atom != NULL; } @@ -469,7 +466,7 @@ update_remote_row(const struct ovsdb_row *row, struct ovsdb_txn *txn, struct ovsdb_row *rw_row; const char *target; const struct ovsdb_jsonrpc_remote_status *status; - char *keys[3], *values[3]; + char *keys[4], *values[4]; size_t n = 0; /* Get the "target" (protocol/host/port) spec. */ @@ -495,8 +492,14 @@ update_remote_row(const struct ovsdb_row *row, struct ovsdb_txn *txn, keys[n] = xstrdup("state"); values[n++] = xstrdup(status->state); - keys[n] = xstrdup("time_in_state"); - values[n++] = xasprintf("%u", status->state_elapsed); + if (status->sec_since_connect != UINT_MAX) { + keys[n] = xstrdup("sec_since_connect"); + values[n++] = xasprintf("%u", status->sec_since_connect); + } + if (status->sec_since_disconnect != UINT_MAX) { + keys[n] = xstrdup("sec_since_disconnect"); + values[n++] = xasprintf("%u", status->sec_since_disconnect); + } if (status->last_error) { keys[n] = xstrdup("last_error"); values[n++] = @@ -545,14 +548,14 @@ update_remote_rows(const struct ovsdb *db, struct ovsdb_txn *txn, static void update_remote_status(const struct ovsdb_jsonrpc_server *jsonrpc, - const struct shash *remotes, struct ovsdb *db) + const struct sset *remotes, struct ovsdb *db) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); - struct shash_node *remote; struct shash statuses; struct ovsdb_txn *txn; const bool durable_txn = false; struct ovsdb_error *error; + const char *remote; /* Get status of current connections. */ ovsdb_jsonrpc_server_get_remote_status(jsonrpc, &statuses); @@ -560,8 +563,8 @@ update_remote_status(const struct ovsdb_jsonrpc_server *jsonrpc, txn = ovsdb_txn_create(db); /* Iterate over --remote arguments given on command line. */ - SHASH_FOR_EACH (remote, remotes) { - update_remote_rows(db, txn, remote->name, &statuses); + SSET_FOR_EACH (remote, remotes) { + update_remote_rows(db, txn, remote, &statuses); } error = ovsdb_txn_commit(txn, durable_txn); @@ -576,16 +579,14 @@ update_remote_status(const struct ovsdb_jsonrpc_server *jsonrpc, /* Reconfigures ovsdb-server based on information in the database. */ static void reconfigure_from_db(struct ovsdb_jsonrpc_server *jsonrpc, - const struct ovsdb *db, struct shash *remotes) + const struct ovsdb *db, struct sset *remotes) { struct shash resolved_remotes; - struct shash_node *node; + const char *name; /* Configure remotes. */ shash_init(&resolved_remotes); - SHASH_FOR_EACH (node, remotes) { - const char *name = node->name; - + SSET_FOR_EACH (name, remotes) { if (!strncmp(name, "db:", 3)) { query_db_remotes(name, db, &resolved_remotes); } else { @@ -595,13 +596,11 @@ reconfigure_from_db(struct ovsdb_jsonrpc_server *jsonrpc, ovsdb_jsonrpc_server_set_remotes(jsonrpc, &resolved_remotes); shash_destroy_free_data(&resolved_remotes); -#if HAVE_OPENSSL /* Configure SSL. */ stream_ssl_set_key_and_cert(query_db_string(db, private_key_file), query_db_string(db, certificate_file)); stream_ssl_set_ca_cert_file(query_db_string(db, ca_cert_file), bootstrap_ca_cert); -#endif } static void @@ -646,7 +645,7 @@ ovsdb_server_reconnect(struct unixctl_conn *conn, const char *args OVS_UNUSED, static void parse_options(int argc, char *argv[], char **file_namep, - struct shash *remotes, char **unixctl_pathp, + struct sset *remotes, char **unixctl_pathp, char **run_command) { enum { @@ -660,25 +659,23 @@ parse_options(int argc, char *argv[], char **file_namep, DAEMON_OPTION_ENUMS }; static struct option long_options[] = { - {"remote", required_argument, 0, OPT_REMOTE}, - {"unixctl", required_argument, 0, OPT_UNIXCTL}, - {"run", required_argument, 0, OPT_RUN}, - {"help", no_argument, 0, 'h'}, - {"version", no_argument, 0, 'V'}, + {"remote", required_argument, NULL, OPT_REMOTE}, + {"unixctl", required_argument, NULL, OPT_UNIXCTL}, + {"run", required_argument, NULL, OPT_RUN}, + {"help", no_argument, NULL, 'h'}, + {"version", no_argument, NULL, 'V'}, DAEMON_LONG_OPTIONS, VLOG_LONG_OPTIONS, LEAK_CHECKER_LONG_OPTIONS, -#ifdef HAVE_OPENSSL - {"bootstrap-ca-cert", required_argument, 0, OPT_BOOTSTRAP_CA_CERT}, - {"private-key", required_argument, 0, 'p'}, - {"certificate", required_argument, 0, 'c'}, - {"ca-cert", required_argument, 0, 'C'}, -#endif - {0, 0, 0, 0}, + {"bootstrap-ca-cert", required_argument, NULL, OPT_BOOTSTRAP_CA_CERT}, + {"private-key", required_argument, NULL, 'p'}, + {"certificate", required_argument, NULL, 'c'}, + {"ca-cert", required_argument, NULL, 'C'}, + {NULL, 0, NULL, 0}, }; char *short_options = long_options_to_short_options(long_options); - shash_init(remotes); + sset_init(remotes); for (;;) { int c; @@ -689,7 +686,7 @@ parse_options(int argc, char *argv[], char **file_namep, switch (c) { case OPT_REMOTE: - shash_add_once(remotes, optarg, NULL); + sset_add(remotes, optarg); break; case OPT_UNIXCTL: @@ -711,7 +708,6 @@ parse_options(int argc, char *argv[], char **file_namep, DAEMON_OPTION_HANDLERS LEAK_CHECKER_OPTION_HANDLERS -#ifdef HAVE_OPENSSL case 'p': private_key_file = optarg; break; @@ -729,7 +725,6 @@ parse_options(int argc, char *argv[], char **file_namep, ca_cert_file = optarg; bootstrap_ca_cert = true; break; -#endif case '?': exit(EXIT_FAILURE);