netdev: do not allow devices to be opened with conflicting types

[cascardo/ovs.git] / ovsdb / replication.c

diff --git a/ovsdb/replication.c b/ovsdb/replication.c
index f734ae2..52b7085 100644 (file)
--- a/ovsdb/replication.c
+++ b/ovsdb/replication.c
@@ -20,7 +20,7 @@
 #include "replication.h"
 
 #include "condition.h"
-#include "json.h"
+#include "openvswitch/json.h"
 #include "jsonrpc.h"
 #include "ovsdb.h"
 #include "ovsdb-error.h"
@@ -38,7 +38,6 @@ static struct sset monitored_tables = SSET_INITIALIZER(&monitored_tables);
 static struct sset tables_blacklist = SSET_INITIALIZER(&tables_blacklist);
 static bool reset_dbs = true;
 
-void replication_init(void);
 static struct jsonrpc *open_jsonrpc(const char *server);
 static struct ovsdb_error *check_jsonrpc_error(int error,
                                                struct jsonrpc_msg **reply_);
@@ -118,6 +117,12 @@ set_remote_ovsdb_server(const char *remote_server)
     remote_ovsdb_server = nullable_xstrdup(remote_server);
 }
 
+const char *
+get_remote_ovsdb_server(void)
+{
+    return remote_ovsdb_server;
+}
+
 void
 set_tables_blacklist(const char *blacklist)
 {
@@ -127,6 +132,12 @@ set_tables_blacklist(const char *blacklist)
     }
 }
 
+struct sset
+get_tables_blacklist(void)
+{
+    return tables_blacklist;
+}
+
 void
 disconnect_remote_server(void)
 {