}
ovsdb_jsonrpc_server_destroy(jsonrpc);
ovsdb_destroy(db);
- shash_destroy(&remotes);
+ shash_destroy_free_data(&remotes);
unixctl_server_destroy(unixctl);
if (run_process && process_exited(run_process)) {
*tablep = table;
}
-#if HAVE_OPENSSL
-static const char *
+static OVS_UNUSED const char *
query_db_string(const struct ovsdb *db, const char *name)
{
if (!name || strncmp(name, "db:", 3)) {
return NULL;
}
}
-#endif /* HAVE_OPENSSL */
static struct ovsdb_jsonrpc_options *
add_remote(struct shash *remotes, const char *target)
keys[n] = xstrdup("state");
values[n++] = xstrdup(status->state);
- keys[n] = xstrdup("time_in_state");
- values[n++] = xasprintf("%u", status->state_elapsed);
+ keys[n] = xstrdup(status->is_connected ? "time_connected"
+ : "time_disconnected");
+ values[n++] = xasprintf("%u", status->conn_secs);
if (status->last_error) {
keys[n] = xstrdup("last_error");
values[n++] =
}
}
ovsdb_jsonrpc_server_set_remotes(jsonrpc, &resolved_remotes);
- shash_destroy(&resolved_remotes);
+ shash_destroy_free_data(&resolved_remotes);
#if HAVE_OPENSSL
/* Configure SSL. */