git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-vsctl: Try connecting only once for active connections by default.
[sliver-openvswitch.git]
/
ovsdb
/
jsonrpc-server.c
diff --git
a/ovsdb/jsonrpc-server.c
b/ovsdb/jsonrpc-server.c
index
6d07c45
..
6e0a6f6
100644
(file)
--- a/
ovsdb/jsonrpc-server.c
+++ b/
ovsdb/jsonrpc-server.c
@@
-210,7
+210,7
@@
ovsdb_jsonrpc_server_add_remote(struct ovsdb_jsonrpc_server *svr,
shash_add(&svr->remotes, name, remote);
if (!listener) {
shash_add(&svr->remotes, name, remote);
if (!listener) {
- ovsdb_jsonrpc_session_create(remote, jsonrpc_session_open(name));
+ ovsdb_jsonrpc_session_create(remote, jsonrpc_session_open(name
, true
));
}
return remote;
}
}
return remote;
}
@@
-384,6
+384,11
@@
ovsdb_jsonrpc_session_close(struct ovsdb_jsonrpc_session *s)
{
ovsdb_jsonrpc_monitor_remove_all(s);
ovsdb_jsonrpc_session_unlock_all(s);
{
ovsdb_jsonrpc_monitor_remove_all(s);
ovsdb_jsonrpc_session_unlock_all(s);
+ ovsdb_jsonrpc_trigger_complete_all(s);
+
+ hmap_destroy(&s->monitors);
+ hmap_destroy(&s->triggers);
+
jsonrpc_session_close(s->js);
list_remove(&s->node);
s->remote->server->n_sessions--;
jsonrpc_session_close(s->js);
list_remove(&s->node);
s->remote->server->n_sessions--;