X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink%2B%2B.h;h=4179a9ec248b274ec0681917436c9beb434486d0;hb=f712fdc0b3de22566cdf06954256c62f46f25542;hp=83eafdfa15c26e852b5417445388953c779889f2;hpb=b5a8aaba0ae78e93f8a972c9c7911fc2bc664b4e;p=meshlink

diff --git a/src/meshlink++.h b/src/meshlink++.h
index 83eafdfa..4179a9ec 100644
--- a/src/meshlink++.h
+++ b/src/meshlink++.h
@@ -49,6 +49,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.
@@ -181,15 +188,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 +279,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);
@@ -360,6 +374,42 @@ public:
 		return meshlink_verify(handle, source, data, len, signature, siglen);
 	}
 
+	/// Set the canonical Address for a node.
+	/** This function sets the canonical Address for a node.
+	 *  This address is stored permanently until it is changed by another call to this function,
+	 *  unlike other addresses associated with a node,
+	 *  such as those added with meshlink_hint_address() or addresses discovered at runtime.
+	 *
+	 *  If a canonical Address is set for the local node,
+	 *  it will be used for the hostname part of generated invitation URLs.
+	 *
+	 *  @param node         A pointer to a meshlink_node_t describing the node.
+	 *  @param address      A nul-terminated C string containing the address, which can be either in numeric format or a hostname.
+	 *  @param port         A nul-terminated C string containing the port, which can be either in numeric or symbolic format.
+	 *                      If it is NULL, the listening port's number will be used.
+	 *
+	 *  @return             This function returns true if the address was added, false otherwise.
+	 */
+	bool set_canonical_address(node *node, const char *address, const char *port = NULL) {
+		return meshlink_set_canonical_address(handle, node, address, port);
+	}
+
+	/// Set the canonical Address for the local node.
+	/** This function sets the canonical Address for the local node.
+	 *  This address is stored permanently until it is changed by another call to this function,
+	 *  unlike other addresses associated with a node,
+	 *  such as those added with meshlink_hint_address() or addresses discovered at runtime.
+	 *
+	 *  @param address      A nul-terminated C string containing the address, which can be either in numeric format or a hostname.
+	 *  @param port         A nul-terminated C string containing the port, which can be either in numeric or symbolic format.
+	 *                      If it is NULL, the listening port's number will be used.
+	 *
+	 *  @return             This function returns true if the address was added, false otherwise.
+	 */
+	bool set_canonical_address(const char *address, const char *port = NULL) {
+		return meshlink_set_canonical_address(handle, get_self(), address, port);
+	}
+
 	/// Add an Address for the local node.
 	/** This function adds an Address for the local node, which will be used for invitation URLs.
 	 *
@@ -438,6 +488,16 @@ public:
 		return meshlink_set_port(handle, port);
 	}
 
+	/// Set the timeout for invitations.
+	/** This function sets the timeout for invitations.
+	 *  The timeout is retroactively applied to all outstanding invitations.
+	 *
+	 *  @param timeout      The timeout for invitations in seconds.
+	 */
+	void set_invitation_timeout(int timeout) {
+		meshlink_set_invitation_timeout(handle, timeout);
+	}
+
 	/// Invite another node into the mesh.
 	/** This function generates an invitation that can be used by another node to join the same mesh as the local node.
 	 *  The generated invitation is a string containing a URL.
@@ -624,6 +684,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;