X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink_internal.h;h=a40de535a8dbc911f80ef10507354bbb9936e8ec;hb=2fd608c4111ef4d48a649401d918f5981856cc44;hp=92774c49baf3c9481d4aac62273256156c77d629;hpb=92283d7342fabd882126a892b2636d57ff0458de;p=meshlink

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 92774c49..a40de535 100644
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -3,7 +3,7 @@
 
 /*
     meshlink_internal.h -- Internal parts of the public API.
-    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014-2019 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,6 +20,10 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
+#ifdef MESHLINK_H
+#error You must not include both meshlink.h and meshlink_internal.h!
+#endif
+
 #include "system.h"
 
 #include "event.h"
@@ -57,6 +61,15 @@ typedef enum proxytype_t {
 	PROXY_HTTP,
 } proxytype_t;
 
+struct meshlink_open_params {
+	char *confbase;
+	char *appname;
+	char *name;
+	dev_class_t devclass;
+
+	int netns;
+};
+
 /// A handle for an instance of MeshLink.
 struct meshlink_handle {
 	char *name;
@@ -75,6 +88,7 @@ struct meshlink_handle {
 
 	meshlink_channel_accept_cb_t channel_accept_cb;
 	meshlink_node_duplicate_cb_t node_duplicate_cb;
+	meshlink_connection_try_cb_t connection_try_cb;
 
 	pthread_t thread;
 	bool threadstarted;
@@ -92,6 +106,7 @@ struct meshlink_handle {
 
 	struct list_t *connections;
 	struct list_t *outgoings;
+	struct list_t *submeshes;
 
 	meshlink_queue_t outpacketqueue;
 
@@ -145,6 +160,8 @@ struct meshlink_handle {
 	struct CattaSimplePoll *catta_poll;
 	struct CattaSEntryGroup *catta_group;
 	char *catta_servicetype;
+
+	int netns;
 };
 
 /// A handle for a MeshLink node.
@@ -153,6 +170,12 @@ struct meshlink_node {
 	void *priv;
 };
 
+/// A handle for a node Sub-Mesh.
+struct meshlink_submesh {
+	const char *name;
+	void *priv;
+};
+
 /// A channel.
 struct meshlink_channel {
 	struct node_t *node;