#include "command-line.h"
#include "daemon.h"
#include "fault.h"
+#include "file.h"
#include "json.h"
#include "jsonrpc.h"
#include "jsonrpc-server.h"
struct svec *active, struct svec *passive);
static void usage(void) NO_RETURN;
-static void ovsdb_transact(struct unixctl_conn *, const char *args, void *db);
-
int
main(int argc, char *argv[])
{
struct svec active, passive;
struct ovsdb_error *error;
struct ovsdb *db;
+ const char *name;
char *file_name;
int retval;
+ size_t i;
set_program_name(argv[0]);
register_fault_handlers();
parse_options(argc, argv, &file_name, &active, &passive);
- error = ovsdb_open(file_name, false, &db);
+ error = ovsdb_file_open(file_name, false, &db);
if (error) {
ovs_fatal(0, "%s", ovsdb_error_to_string(error));
}
- retval = ovsdb_jsonrpc_server_create(db, &active, &passive, &jsonrpc);
- if (retval) {
- ovs_fatal(retval, "failed to initialize JSON-RPC server for OVSDB");
+ jsonrpc = ovsdb_jsonrpc_server_create(db);
+ SVEC_FOR_EACH (i, name, &active) {
+ ovsdb_jsonrpc_server_connect(jsonrpc, name);
+ }
+ SVEC_FOR_EACH (i, name, &passive) {
+ retval = ovsdb_jsonrpc_server_listen(jsonrpc, name);
+ if (retval) {
+ ovs_fatal(retval, "failed to listen on %s", name);
+ }
}
svec_destroy(&active);
svec_destroy(&passive);
ovs_fatal(retval, "could not listen for control connections");
}
- unixctl_command_register("ovsdb/transact", ovsdb_transact, db);
-
for (;;) {
ovsdb_jsonrpc_server_run(jsonrpc);
unixctl_server_run(unixctl);
leak_checker_usage();
exit(EXIT_SUCCESS);
}
-\f
-static void
-ovsdb_transact(struct unixctl_conn *conn, const char *args, void *db_)
-{
- struct ovsdb *db = db_;
- struct json *request, *reply;
- char *reply_string;
-
- /* Parse JSON. */
- request = json_from_string(args);
- if (request->type == JSON_STRING) {
- unixctl_command_reply(conn, 501, request->u.string);
- json_destroy(request);
- return;
- }
-
- /* Execute command. */
- reply = ovsdb_execute(db, request, 0, NULL);
- reply_string = json_to_string(reply, 0);
- unixctl_command_reply(conn, 200, reply_string);
- free(reply_string);
- json_destroy(reply);
-}