X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink%2B%2B.h;h=b9889aa1898bed14f28a6f2d58ca48df31b50d3b;hb=43d8f901c4bbb693643bb6f188c97dd28c1d0b0a;hp=413534ea2ceae0a4beeb3f77a2d7c3f1800d0b8c;hpb=34a52e6e69be085ee99755c2890268d2ce11f9b4;p=meshlink

diff --git a/src/meshlink++.h b/src/meshlink++.h
index 413534ea..b9889aa1 100644
--- a/src/meshlink++.h
+++ b/src/meshlink++.h
@@ -27,6 +27,7 @@ namespace meshlink {
 class mesh;
 class node;
 class channel;
+class submesh;
 
 /// Severity of log messages generated by MeshLink.
 typedef meshlink_log_level_t log_level_t;
@@ -49,6 +50,13 @@ typedef void (*receive_cb_t)(mesh *mesh, node *source, const void *data, size_t
  */
 typedef void (*node_status_cb_t)(mesh *mesh, node *node, bool reachable);
 
+/// A callback reporting duplicate node detection.
+/** @param mesh       A handle which represents an instance of MeshLink.
+ *  @param node       A pointer to a meshlink_node_t describing the node which is duplicate.
+ *                    This pointer is valid until meshlink_close() is called.
+ */
+typedef void (*duplicate_cb_t)(mesh *mesh, node *node);
+
 /// A callback for receiving log messages generated by MeshLink.
 /** @param mesh      A handle which represents an instance of MeshLink.
  *  @param level     An enum describing the severity level of the message.
@@ -87,6 +95,10 @@ typedef void (*channel_poll_cb_t)(mesh *mesh, channel *channel, size_t len);
 class node: public meshlink_node_t {
 };
 
+/// A class describing a MeshLink Sub-Mesh.
+class submesh: public meshlink_submesh_t {
+};
+
 /// A class describing a MeshLink channel.
 class channel: public meshlink_channel_t {
 public:
@@ -181,15 +193,21 @@ public:
 		(void) length;
 	}
 
-	/// This functions is called  whenever another node's status changed.
-	virtual void node_status(node *peer, bool reachable)                {
+	/// This functions is called whenever another node's status changed.
+	virtual void node_status(node *peer, bool reachable) {
 		/* do nothing */
 		(void)peer;
 		(void)reachable;
 	}
 
+	/// This functions is called whenever a duplicate node is detected.
+	virtual void node_duplicate(node *peer) {
+		/* do nothing */
+		(void)peer;
+	}
+
 	/// This functions is called whenever MeshLink has some information to log.
-	virtual void log(log_level_t level, const char *message)            {
+	virtual void log(log_level_t level, const char *message) {
 		/* do nothing */
 		(void)level;
 		(void)message;
@@ -266,6 +284,7 @@ public:
 	bool start() {
 		meshlink_set_receive_cb(handle, &receive_trampoline);
 		meshlink_set_node_status_cb(handle, &node_status_trampoline);
+		meshlink_set_node_duplicate_cb(handle, &node_duplicate_trampoline);
 		meshlink_set_log_cb(handle, MESHLINK_DEBUG, &log_trampoline);
 		meshlink_set_channel_accept_cb(handle, &channel_accept_trampoline);
 		return meshlink_start(handle);
@@ -432,6 +451,28 @@ public:
 		return meshlink_get_external_address_for_family(handle, family);
 	}
 
+	/** This function performs tries to discover the address of the local interface used for outgoing connection.
+	 *
+	 *  Please note that this is function only returns a single address,
+	 *  even if the local node might have more than one external address.
+	 *  In that case, there is no control over which address will be selected.
+	 *  Also note that if you have a dynamic IP address, or are behind carrier-grade NAT,
+	 *  there is no guarantee that the external address will be valid for an extended period of time.
+	 *
+	 *  This function will fail if it couldn't find a local address for the given address family.
+	 *  If hostname resolving is requested, this function may block for a few seconds.
+	 *
+	 *  @param family       The address family to check, for example AF_INET or AF_INET6. If AF_UNSPEC is given,
+	 *                      this might return the external address for any working address family.
+	 *
+	 *  @return             This function returns a pointer to a C string containing the discovered external address,
+	 *                      or NULL if there was an error looking up the address.
+	 *                      After get_external_address() returns, the application is free to overwrite or free this string.
+	 */
+	bool get_local_address(int family = AF_UNSPEC) {
+		return meshlink_get_local_address_for_family(handle, family);
+	}
+
 	/// Try to discover the external address for the local node, and add it to its list of addresses.
 	/** This function is equivalent to:
 	 *
@@ -491,12 +532,13 @@ public:
 	 *  The URL can only be used once, after the user has joined the mesh the URL is no longer valid.
 	 *
 	 *  @param name         The name that the invitee will use in the mesh.
+	 *  @param flags        A bitwise-or'd combination of flags that controls how the URL is generated.
 	 *
 	 *  @return             This function returns a string that contains the invitation URL.
 	 *                      The application should call free() after it has finished using the URL.
 	 */
-	char *invite(const char *name) {
-		return meshlink_invite(handle, name);
+	char *invite(submesh *submesh, const char *name, uint32_t flags = 0) {
+		return meshlink_invite_ex(handle, submesh, name, flags);
 	}
 
 	/// Use an invitation to join a mesh.
@@ -670,6 +712,15 @@ private:
 		that->node_status(static_cast<node *>(peer), reachable);
 	}
 
+	static void node_duplicate_trampoline(meshlink_handle_t *handle, meshlink_node_t *peer) {
+		if(!(handle->priv)) {
+			return;
+		}
+
+		meshlink::mesh *that = static_cast<mesh *>(handle->priv);
+		that->node_duplicate(static_cast<node *>(peer));
+	}
+
 	static void log_trampoline(meshlink_handle_t *handle, log_level_t level, const char *message) {
 		if(!(handle->priv)) {
 			return;