-/* Copyright (c) 2009 Nicira Networks
+/* Copyright (c) 2009, 2010 Nicira Networks
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include "jsonrpc-server.h"
+#include <assert.h>
#include <errno.h>
#include "column.h"
#define THIS_MODULE VLM_ovsdb_jsonrpc_server
#include "vlog.h"
+struct ovsdb_jsonrpc_remote;
struct ovsdb_jsonrpc_session;
+/* Message rate-limiting. */
+struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5);
+
/* Sessions. */
-static void ovsdb_jsonrpc_session_create_active(struct ovsdb_jsonrpc_server *,
- const char *name);
-static void ovsdb_jsonrpc_session_create_passive(struct ovsdb_jsonrpc_server *,
- struct stream *);
-static void ovsdb_jsonrpc_session_run_all(struct ovsdb_jsonrpc_server *);
-static void ovsdb_jsonrpc_session_wait_all(struct ovsdb_jsonrpc_server *);
+static struct ovsdb_jsonrpc_session *ovsdb_jsonrpc_session_create(
+ struct ovsdb_jsonrpc_remote *, struct jsonrpc_session *);
+static void ovsdb_jsonrpc_session_run_all(struct ovsdb_jsonrpc_remote *);
+static void ovsdb_jsonrpc_session_wait_all(struct ovsdb_jsonrpc_remote *);
+static void ovsdb_jsonrpc_session_close_all(struct ovsdb_jsonrpc_remote *);
/* Triggers. */
static void ovsdb_jsonrpc_trigger_create(struct ovsdb_jsonrpc_session *,
struct ovsdb_jsonrpc_server {
struct ovsdb *db;
-
- struct list sessions; /* List of "struct ovsdb_jsonrpc_session"s. */
unsigned int n_sessions, max_sessions;
- unsigned int max_triggers;
+ struct shash remotes; /* Contains "struct ovsdb_jsonrpc_remote *"s. */
+};
- struct pstream **listeners;
- size_t n_listeners, allocated_listeners;
+/* A configured remote. This is either a passive stream listener plus a list
+ * of the currently connected sessions, or a list of exactly one active
+ * session. */
+struct ovsdb_jsonrpc_remote {
+ struct ovsdb_jsonrpc_server *server;
+ struct pstream *listener; /* Listener, if passive. */
+ struct list sessions; /* List of "struct ovsdb_jsonrpc_session"s. */
};
+static void ovsdb_jsonrpc_server_add_remote(struct ovsdb_jsonrpc_server *,
+ const char *name);
+static void ovsdb_jsonrpc_server_del_remote(struct shash_node *);
+
struct ovsdb_jsonrpc_server *
ovsdb_jsonrpc_server_create(struct ovsdb *db)
{
struct ovsdb_jsonrpc_server *server = xzalloc(sizeof *server);
server->db = db;
server->max_sessions = 64;
- server->max_triggers = 64;
- list_init(&server->sessions);
+ shash_init(&server->remotes);
return server;
}
-int
-ovsdb_jsonrpc_server_listen(struct ovsdb_jsonrpc_server *svr, const char *name)
+void
+ovsdb_jsonrpc_server_destroy(struct ovsdb_jsonrpc_server *svr)
+{
+ struct shash_node *node, *next;
+
+ SHASH_FOR_EACH_SAFE (node, next, &svr->remotes) {
+ ovsdb_jsonrpc_server_del_remote(node);
+ }
+ shash_destroy(&svr->remotes);
+ free(svr);
+}
+
+/* Sets 'svr''s current set of remotes to the names in 'new_remotes'. The data
+ * values in 'new_remotes' are ignored.
+ *
+ * A remote is an active or passive stream connection method, e.g. "pssl:" or
+ * "tcp:1.2.3.4". */
+void
+ovsdb_jsonrpc_server_set_remotes(struct ovsdb_jsonrpc_server *svr,
+ const struct shash *new_remotes)
{
- struct pstream *pstream;
+ struct shash_node *node, *next;
+
+ SHASH_FOR_EACH_SAFE (node, next, &svr->remotes) {
+ if (!shash_find(new_remotes, node->name)) {
+ ovsdb_jsonrpc_server_del_remote(node);
+ }
+ }
+ SHASH_FOR_EACH (node, new_remotes) {
+ if (!shash_find(&svr->remotes, node->name)) {
+ ovsdb_jsonrpc_server_add_remote(svr, node->name);
+ }
+ }
+}
+
+static void
+ovsdb_jsonrpc_server_add_remote(struct ovsdb_jsonrpc_server *svr,
+ const char *name)
+{
+ struct ovsdb_jsonrpc_remote *remote;
+ struct pstream *listener;
int error;
- error = pstream_open(name, &pstream);
- if (error) {
- return error;
+ error = pstream_open(name, &listener);
+ if (error && error != EAFNOSUPPORT) {
+ VLOG_ERR_RL(&rl, "%s: listen failed: %s", name, strerror(error));
+ return;
}
- if (svr->n_listeners >= svr->allocated_listeners) {
- svr->listeners = x2nrealloc(svr->listeners, &svr->allocated_listeners,
- sizeof *svr->listeners);
+ remote = xmalloc(sizeof *remote);
+ remote->server = svr;
+ remote->listener = listener;
+ list_init(&remote->sessions);
+ shash_add(&svr->remotes, name, remote);
+
+ if (!listener) {
+ ovsdb_jsonrpc_session_create(remote, jsonrpc_session_open(name));
}
- svr->listeners[svr->n_listeners++] = pstream;
- return 0;
}
-void
-ovsdb_jsonrpc_server_connect(struct ovsdb_jsonrpc_server *svr,
- const char *name)
+static void
+ovsdb_jsonrpc_server_del_remote(struct shash_node *node)
{
- ovsdb_jsonrpc_session_create_active(svr, name);
+ struct ovsdb_jsonrpc_remote *remote = node->data;
+
+ ovsdb_jsonrpc_session_close_all(remote);
+ pstream_close(remote->listener);
+ shash_delete(&remote->server->remotes, node);
+ free(remote);
}
void
ovsdb_jsonrpc_server_run(struct ovsdb_jsonrpc_server *svr)
{
- size_t i;
+ struct shash_node *node;
- /* Accept new connections. */
- for (i = 0; i < svr->n_listeners && svr->n_sessions < svr->max_sessions;) {
- struct pstream *listener = svr->listeners[i];
- struct stream *stream;
- int error;
-
- error = pstream_accept(listener, &stream);
- if (!error) {
- ovsdb_jsonrpc_session_create_passive(svr, stream);
- } else if (error == EAGAIN) {
- i++;
- } else if (error) {
- VLOG_WARN("%s: accept failed: %s",
- pstream_get_name(listener), strerror(error));
- pstream_close(listener);
- svr->listeners[i] = svr->listeners[--svr->n_listeners];
+ SHASH_FOR_EACH (node, &svr->remotes) {
+ struct ovsdb_jsonrpc_remote *remote = node->data;
+
+ if (remote->listener && svr->n_sessions < svr->max_sessions) {
+ struct stream *stream;
+ int error;
+
+ error = pstream_accept(remote->listener, &stream);
+ if (!error) {
+ struct jsonrpc_session *js;
+ js = jsonrpc_session_open_unreliably(jsonrpc_open(stream));
+ ovsdb_jsonrpc_session_create(remote, js);
+ } else if (error != EAGAIN) {
+ VLOG_WARN_RL(&rl, "%s: accept failed: %s",
+ pstream_get_name(remote->listener),
+ strerror(error));
+ }
}
- }
- /* Handle each session. */
- ovsdb_jsonrpc_session_run_all(svr);
+ ovsdb_jsonrpc_session_run_all(remote);
+ }
}
void
ovsdb_jsonrpc_server_wait(struct ovsdb_jsonrpc_server *svr)
{
- if (svr->n_sessions < svr->max_sessions) {
- size_t i;
+ struct shash_node *node;
- for (i = 0; i < svr->n_listeners; i++) {
- pstream_wait(svr->listeners[i]);
+ SHASH_FOR_EACH (node, &svr->remotes) {
+ struct ovsdb_jsonrpc_remote *remote = node->data;
+
+ if (remote->listener && svr->n_sessions < svr->max_sessions) {
+ pstream_wait(remote->listener);
}
- }
- ovsdb_jsonrpc_session_wait_all(svr);
+ ovsdb_jsonrpc_session_wait_all(remote);
+ }
}
\f
/* JSON-RPC database server session. */
struct ovsdb_jsonrpc_session {
- struct ovsdb_jsonrpc_server *server;
- struct list node; /* Element in server's sessions list. */
+ struct ovsdb_jsonrpc_remote *remote;
+ struct list node; /* Element in remote's sessions list. */
/* Triggers. */
struct hmap triggers; /* Hmap of "struct ovsdb_jsonrpc_trigger"s. */
/* Monitors. */
struct hmap monitors; /* Hmap of "struct ovsdb_jsonrpc_monitor"s. */
- /* Connecting and reconnecting. */
- struct reconnect *reconnect; /* For back-off. */
- bool active; /* Active or passive connection? */
- struct jsonrpc *rpc;
- struct stream *stream; /* Only if active == false and rpc == NULL. */
+ /* Network connectivity. */
+ struct jsonrpc_session *js; /* JSON-RPC session. */
+ unsigned int js_seqno; /* Last jsonrpc_session_get_seqno() value. */
};
static void ovsdb_jsonrpc_session_close(struct ovsdb_jsonrpc_session *);
-static void ovsdb_jsonrpc_session_disconnect(struct ovsdb_jsonrpc_session *s);
static int ovsdb_jsonrpc_session_run(struct ovsdb_jsonrpc_session *);
static void ovsdb_jsonrpc_session_wait(struct ovsdb_jsonrpc_session *);
static void ovsdb_jsonrpc_session_got_request(struct ovsdb_jsonrpc_session *,
struct jsonrpc_msg *);
static struct ovsdb_jsonrpc_session *
-ovsdb_jsonrpc_session_create(struct ovsdb_jsonrpc_server *svr,
- const char *name, bool active)
+ovsdb_jsonrpc_session_create(struct ovsdb_jsonrpc_remote *remote,
+ struct jsonrpc_session *js)
{
struct ovsdb_jsonrpc_session *s;
s = xzalloc(sizeof *s);
- s->server = svr;
- list_push_back(&svr->sessions, &s->node);
+ s->remote = remote;
+ list_push_back(&remote->sessions, &s->node);
hmap_init(&s->triggers);
hmap_init(&s->monitors);
list_init(&s->completions);
- s->reconnect = reconnect_create(time_msec());
- reconnect_set_name(s->reconnect, name);
- reconnect_enable(s->reconnect, time_msec());
- s->active = active;
+ s->js = js;
+ s->js_seqno = jsonrpc_session_get_seqno(js);
- svr->n_sessions++;
+ remote->server->n_sessions++;
return s;
}
-static void
-ovsdb_jsonrpc_session_create_active(struct ovsdb_jsonrpc_server *svr,
- const char *name)
-{
- ovsdb_jsonrpc_session_create(svr, name, true);
-}
-
-static void
-ovsdb_jsonrpc_session_create_passive(struct ovsdb_jsonrpc_server *svr,
- struct stream *stream)
-{
- struct ovsdb_jsonrpc_session *s;
-
- s = ovsdb_jsonrpc_session_create(svr, stream_get_name(stream), false);
- reconnect_connected(s->reconnect, time_msec());
- s->rpc = jsonrpc_open(stream);
-}
-
static void
ovsdb_jsonrpc_session_close(struct ovsdb_jsonrpc_session *s)
{
- ovsdb_jsonrpc_session_disconnect(s);
+ ovsdb_jsonrpc_monitor_remove_all(s);
+ jsonrpc_session_close(s->js);
list_remove(&s->node);
- s->server->n_sessions--;
+ s->remote->server->n_sessions--;
+ free(s);
}
-static void
-ovsdb_jsonrpc_session_disconnect(struct ovsdb_jsonrpc_session *s)
+static int
+ovsdb_jsonrpc_session_run(struct ovsdb_jsonrpc_session *s)
{
- reconnect_disconnected(s->reconnect, time_msec(), 0);
- if (s->rpc) {
- jsonrpc_error(s->rpc, EOF);
+ jsonrpc_session_run(s->js);
+ if (s->js_seqno != jsonrpc_session_get_seqno(s->js)) {
+ s->js_seqno = jsonrpc_session_get_seqno(s->js);
ovsdb_jsonrpc_trigger_complete_all(s);
ovsdb_jsonrpc_monitor_remove_all(s);
- jsonrpc_close(s->rpc);
- s->rpc = NULL;
- } else if (s->stream) {
- stream_close(s->stream);
- s->stream = NULL;
}
-}
-static void
-ovsdb_jsonrpc_session_connect(struct ovsdb_jsonrpc_session *s)
-{
- ovsdb_jsonrpc_session_disconnect(s);
- if (s->active) {
- int error = stream_open(reconnect_get_name(s->reconnect), &s->stream);
- if (error) {
- reconnect_connect_failed(s->reconnect, time_msec(), error);
- } else {
- reconnect_connecting(s->reconnect, time_msec());
- }
- }
-}
-
-static int
-ovsdb_jsonrpc_session_run(struct ovsdb_jsonrpc_session *s)
-{
- if (s->rpc) {
- struct jsonrpc_msg *msg;
- int error;
-
- jsonrpc_run(s->rpc);
+ ovsdb_jsonrpc_trigger_complete_done(s);
- ovsdb_jsonrpc_trigger_complete_done(s);
-
- if (!jsonrpc_get_backlog(s->rpc) && !jsonrpc_recv(s->rpc, &msg)) {
- reconnect_received(s->reconnect, time_msec());
+ if (!jsonrpc_session_get_backlog(s->js)) {
+ struct jsonrpc_msg *msg = jsonrpc_session_recv(s->js);
+ if (msg) {
if (msg->type == JSONRPC_REQUEST) {
ovsdb_jsonrpc_session_got_request(s, msg);
} else if (msg->type == JSONRPC_NOTIFY) {
ovsdb_jsonrpc_session_got_notify(s, msg);
- } else if (msg->type == JSONRPC_REPLY
- && msg->id && msg->id->type == JSON_STRING
- && !strcmp(msg->id->u.string, "echo")) {
- /* It's a reply to our echo request. Ignore it. */
} else {
VLOG_WARN("%s: received unexpected %s message",
- jsonrpc_get_name(s->rpc),
+ jsonrpc_session_get_name(s->js),
jsonrpc_msg_type_to_string(msg->type));
- jsonrpc_error(s->rpc, EPROTO);
+ jsonrpc_session_force_reconnect(s->js);
jsonrpc_msg_destroy(msg);
}
}
-
- error = jsonrpc_get_status(s->rpc);
- if (error) {
- if (s->active) {
- ovsdb_jsonrpc_session_disconnect(s);
- } else {
- return error;
- }
- }
- } else if (s->stream) {
- int error = stream_connect(s->stream);
- if (!error) {
- reconnect_connected(s->reconnect, time_msec());
- s->rpc = jsonrpc_open(s->stream);
- s->stream = NULL;
- } else if (error != EAGAIN) {
- reconnect_connect_failed(s->reconnect, time_msec(), error);
- stream_close(s->stream);
- s->stream = NULL;
- }
}
-
- switch (reconnect_run(s->reconnect, time_msec())) {
- case RECONNECT_CONNECT:
- ovsdb_jsonrpc_session_connect(s);
- break;
-
- case RECONNECT_DISCONNECT:
- ovsdb_jsonrpc_session_disconnect(s);
- break;
-
- case RECONNECT_PROBE:
- if (s->rpc) {
- struct json *params;
- struct jsonrpc_msg *request;
-
- params = json_array_create_empty();
- request = jsonrpc_create_request("echo", params);
- json_destroy(request->id);
- request->id = json_string_create("echo");
- jsonrpc_send(s->rpc, request);
- }
- break;
- }
- return s->active || s->rpc ? 0 : ETIMEDOUT;
+ return jsonrpc_session_is_alive(s->js) ? 0 : ETIMEDOUT;
}
static void
-ovsdb_jsonrpc_session_run_all(struct ovsdb_jsonrpc_server *svr)
+ovsdb_jsonrpc_session_run_all(struct ovsdb_jsonrpc_remote *remote)
{
struct ovsdb_jsonrpc_session *s, *next;
LIST_FOR_EACH_SAFE (s, next, struct ovsdb_jsonrpc_session, node,
- &svr->sessions) {
+ &remote->sessions) {
int error = ovsdb_jsonrpc_session_run(s);
if (error) {
ovsdb_jsonrpc_session_close(s);
static void
ovsdb_jsonrpc_session_wait(struct ovsdb_jsonrpc_session *s)
{
- if (s->rpc) {
- jsonrpc_wait(s->rpc);
- if (!jsonrpc_get_backlog(s->rpc)) {
- jsonrpc_recv_wait(s->rpc);
- }
- } else if (s->stream) {
- stream_connect_wait(s->stream);
+ jsonrpc_session_wait(s->js);
+ if (!jsonrpc_session_get_backlog(s->js)) {
+ jsonrpc_session_recv_wait(s->js);
}
- reconnect_wait(s->reconnect, time_msec());
}
static void
-ovsdb_jsonrpc_session_wait_all(struct ovsdb_jsonrpc_server *svr)
+ovsdb_jsonrpc_session_wait_all(struct ovsdb_jsonrpc_remote *remote)
{
struct ovsdb_jsonrpc_session *s;
- LIST_FOR_EACH (s, struct ovsdb_jsonrpc_session, node, &svr->sessions) {
+ LIST_FOR_EACH (s, struct ovsdb_jsonrpc_session, node, &remote->sessions) {
ovsdb_jsonrpc_session_wait(s);
}
}
+static void
+ovsdb_jsonrpc_session_close_all(struct ovsdb_jsonrpc_remote *remote)
+{
+ struct ovsdb_jsonrpc_session *s, *next;
+
+ LIST_FOR_EACH_SAFE (s, next, struct ovsdb_jsonrpc_session, node,
+ &remote->sessions) {
+ ovsdb_jsonrpc_session_close(s);
+ }
+}
+
+static const char *
+get_db_name(const struct ovsdb_jsonrpc_session *s)
+{
+ return s->remote->server->db->schema->name;
+}
+
+static struct jsonrpc_msg *
+ovsdb_jsonrpc_check_db_name(const struct ovsdb_jsonrpc_session *s,
+ const struct jsonrpc_msg *request)
+{
+ struct json_array *params;
+ const char *want_db_name;
+ const char *have_db_name;
+ struct ovsdb_error *error;
+ struct jsonrpc_msg *reply;
+
+ params = json_array(request->params);
+ if (!params->n || params->elems[0]->type != JSON_STRING) {
+ error = ovsdb_syntax_error(
+ request->params, NULL,
+ "%s request params must begin with <db-name>", request->method);
+ goto error;
+ }
+
+ want_db_name = params->elems[0]->u.string;
+ have_db_name = get_db_name(s);
+ if (strcmp(want_db_name, have_db_name)) {
+ error = ovsdb_syntax_error(
+ request->params, "unknown database",
+ "%s request specifies unknown database %s",
+ request->method, want_db_name);
+ goto error;
+ }
+
+ return NULL;
+
+error:
+ reply = jsonrpc_create_reply(ovsdb_error_to_json(error), request->id);
+ ovsdb_error_destroy(error);
+ return reply;
+}
+
static struct jsonrpc_msg *
execute_transaction(struct ovsdb_jsonrpc_session *s,
struct jsonrpc_msg *request)
ovsdb_jsonrpc_trigger_create(s, request->id, request->params);
request->id = NULL;
request->params = NULL;
+ jsonrpc_msg_destroy(request);
return NULL;
}
struct jsonrpc_msg *reply;
if (!strcmp(request->method, "transact")) {
- reply = execute_transaction(s, request);
+ reply = ovsdb_jsonrpc_check_db_name(s, request);
+ if (!reply) {
+ reply = execute_transaction(s, request);
+ }
} else if (!strcmp(request->method, "monitor")) {
- reply = jsonrpc_create_reply(
- ovsdb_jsonrpc_monitor_create(s, request->params), request->id);
+ reply = ovsdb_jsonrpc_check_db_name(s, request);
+ if (!reply) {
+ reply = jsonrpc_create_reply(
+ ovsdb_jsonrpc_monitor_create(s, request->params), request->id);
+ }
} else if (!strcmp(request->method, "monitor_cancel")) {
reply = ovsdb_jsonrpc_monitor_cancel(s, json_array(request->params),
request->id);
} else if (!strcmp(request->method, "get_schema")) {
+ reply = ovsdb_jsonrpc_check_db_name(s, request);
+ if (!reply) {
+ reply = jsonrpc_create_reply(
+ ovsdb_schema_to_json(s->remote->server->db->schema),
+ request->id);
+ }
+ } else if (!strcmp(request->method, "list_dbs")) {
reply = jsonrpc_create_reply(
- ovsdb_schema_to_json(s->server->db->schema), request->id);
+ json_array_create_1(json_string_create(get_db_name(s))),
+ request->id);
} else if (!strcmp(request->method, "echo")) {
reply = jsonrpc_create_reply(json_clone(request->params), request->id);
} else {
if (reply) {
jsonrpc_msg_destroy(request);
- jsonrpc_send(s->rpc, reply);
+ jsonrpc_session_send(s->js, reply);
}
}
hash = json_hash(id, 0);
t = ovsdb_jsonrpc_trigger_find(s, id, hash);
if (t) {
- jsonrpc_send(s->rpc, jsonrpc_create_error(
- json_string_create("duplicate request ID"), id));
+ struct jsonrpc_msg *msg;
+
+ msg = jsonrpc_create_error(json_string_create("duplicate request ID"),
+ id);
+ jsonrpc_session_send(s->js, msg);
json_destroy(id);
json_destroy(params);
return;
/* Insert into trigger table. */
t = xmalloc(sizeof *t);
- ovsdb_trigger_init(s->server->db,
+ ovsdb_trigger_init(s->remote->server->db,
&t->trigger, params, &s->completions,
time_msec());
t->session = s;
{
struct ovsdb_jsonrpc_session *s = t->session;
- if (s->rpc && !jsonrpc_get_status(s->rpc)) {
+ if (jsonrpc_session_is_connected(s->js)) {
struct jsonrpc_msg *reply;
struct json *result;
reply = jsonrpc_create_error(json_string_create("canceled"),
t->id);
}
- jsonrpc_send(s->rpc, reply);
+ jsonrpc_session_send(s->js, reply);
}
json_destroy(t->id);
struct shash_node *node;
struct json *json;
- if (json_array(params)->n != 2) {
+ if (json_array(params)->n != 3) {
error = ovsdb_syntax_error(params, NULL, "invalid parameters");
goto error;
}
- monitor_id = params->u.array.elems[0];
- monitor_requests = params->u.array.elems[1];
+ monitor_id = params->u.array.elems[1];
+ monitor_requests = params->u.array.elems[2];
if (monitor_requests->type != JSON_OBJECT) {
error = ovsdb_syntax_error(monitor_requests, NULL,
"monitor-requests must be object");
m = xzalloc(sizeof *m);
ovsdb_replica_init(&m->replica, &ovsdb_jsonrpc_replica_class);
- ovsdb_add_replica(s->server->db, &m->replica);
+ ovsdb_add_replica(s->remote->server->db, &m->replica);
m->session = s;
hmap_insert(&s->monitors, &m->node, json_hash(monitor_id, 0));
m->monitor_id = json_clone(monitor_id);
const struct json *columns_json, *select_json;
struct ovsdb_parser parser;
- table = ovsdb_get_table(s->server->db, node->name);
+ table = ovsdb_get_table(s->remote->server->db, node->name);
if (!table) {
error = ovsdb_syntax_error(NULL, NULL,
"no table named %s", node->name);
return ovsdb_jsonrpc_monitor_get_initial(m);
error:
- ovsdb_remove_replica(s->server->db, &m->replica);
+ if (m) {
+ ovsdb_remove_replica(s->remote->server->db, &m->replica);
+ }
json = ovsdb_error_to_json(error);
ovsdb_error_destroy(error);
return jsonrpc_create_error(json_string_create("unknown monitor"),
request_id);
} else {
- ovsdb_remove_replica(s->server->db, &m->replica);
+ ovsdb_remove_replica(s->remote->server->db, &m->replica);
return jsonrpc_create_reply(json_object_create(), request_id);
}
}
HMAP_FOR_EACH_SAFE (m, next,
struct ovsdb_jsonrpc_monitor, node, &s->monitors) {
- ovsdb_remove_replica(s->server->db, &m->replica);
+ ovsdb_remove_replica(s->remote->server->db, &m->replica);
}
}
static struct ovsdb_error *
ovsdb_jsonrpc_monitor_commit(struct ovsdb_replica *replica,
- const struct ovsdb_txn *txn, bool durable UNUSED)
+ const struct ovsdb_txn *txn,
+ bool durable OVS_UNUSED)
{
struct ovsdb_jsonrpc_monitor *m = ovsdb_jsonrpc_monitor_cast(replica);
struct ovsdb_jsonrpc_monitor_aux aux;
params = json_array_create_2(json_clone(aux.monitor->monitor_id),
aux.json);
msg = jsonrpc_create_notify("update", params);
- jsonrpc_send(aux.monitor->session->rpc, msg);
+ jsonrpc_session_send(aux.monitor->session->js, msg);
}
return NULL;
git://git.onelab.eu / sliver-openvswitch.git / blobdiff