X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink%2B%2B.h;h=64673f58cb42dc119ef9eea30e6d2d67826a9b8b;hb=9919d6688b2c79a0da93e3f39eeea2b58e923a1e;hp=6b9c685528bf4015e34e7995cc55cec5159a01e8;hpb=23af52a05391e8083e7211358021bac94e5e0103;p=meshlink

diff --git a/src/meshlink++.h b/src/meshlink++.h
index 6b9c6855..64673f58 100644
--- a/src/meshlink++.h
+++ b/src/meshlink++.h
@@ -259,6 +259,12 @@ public:
 		(void)message;
 	}
 
+	/// This functions is called whenever MeshLink has encountered a serious error.
+	virtual void error(meshlink_errno_t meshlink_errno) {
+		/* do nothing */
+		(void)meshlink_errno;
+	}
+
 	/// This functions is called whenever MeshLink a meta-connection attempt is made.
 	virtual void connection_try(node *peer) {
 		/* do nothing */
@@ -339,6 +345,7 @@ public:
 		meshlink_set_node_pmtu_cb(handle, &node_pmtu_trampoline);
 		meshlink_set_node_duplicate_cb(handle, &node_duplicate_trampoline);
 		meshlink_set_log_cb(handle, MESHLINK_DEBUG, &log_trampoline);
+		meshlink_set_error_cb(handle, &error_trampoline);
 		meshlink_set_channel_accept_cb(handle, &channel_accept_trampoline);
 		meshlink_set_connection_try_cb(handle, &connection_try_trampoline);
 		return meshlink_start(handle);
@@ -701,6 +708,18 @@ public:
 		meshlink_set_channel_rcvbuf(handle, channel, size);
 	}
 
+	/// Set the connection timeout used for channels to the given node.
+	/** This sets the timeout after which unresponsive channels will be reported as closed.
+	 *  The timeout is set for all current and future channels to the given node.
+	 *
+	 *  @param channel      A handle for the channel.
+	 *  @param timeout      The timeout in seconds after which unresponsive channels will be reported as closed.
+	 *                      The default is 60 seconds.
+	 */
+	void set_node_channel_timeout(node *node, int timeout) {
+		meshlink_set_node_channel_timeout(handle, node, timeout);
+	}
+
 	/// Open a reliable stream channel to another node.
 	/** This function is called whenever a remote node wants to open a channel to the local node.
 	 *  The application then has to decide whether to accept or reject this channel.
@@ -713,6 +732,7 @@ public:
 	 *  @param cb           A pointer to the function which will be called when the remote node sends data to the local node.
 	 *  @param data         A pointer to a buffer containing data to already queue for sending.
 	 *  @param len          The length of the data.
+	 *                      If len is 0, the data pointer is copied into the channel's priv member.
 	 *  @param flags        A bitwise-or'd combination of flags that set the semantics for this channel.
 	 *
 	 *  @return             A handle for the channel, or NULL in case of an error.
@@ -737,6 +757,7 @@ public:
 	 *  @param port         The port number the peer wishes to connect to.
 	 *  @param data         A pointer to a buffer containing data to already queue for sending.
 	 *  @param len          The length of the data.
+	 *                      If len is 0, the data pointer is copied into the channel's priv member.
 	 *  @param flags        A bitwise-or'd combination of flags that set the semantics for this channel.
 	 *
 	 *  @return             A handle for the channel, or NULL in case of an error.
@@ -796,6 +817,7 @@ public:
 	 *                      until the callback routine is called.
 	 *  @param len          The length of the data, or 0 if there is no data to send.
 	 *  @param cb           A pointer to the function which will be called when MeshLink has finished using the buffer.
+	 *  @param priv         A private pointer which was set by the application when submitting the buffer.
 	 *
 	 *  @return             True if the buffer was enqueued, false otherwise.
 	 */
@@ -812,6 +834,7 @@ public:
 	 *  @param fd           A file descriptor from which data will be read.
 	 *  @param len          The length of the data, or 0 if there is no data to send.
 	 *  @param cb           A pointer to the function which will be called when MeshLink has finished using the filedescriptor.
+	 *  @param priv         A private pointer which was set by the application when submitting the buffer.
 	 *
 	 *  @return             True if the buffer was enqueued, false otherwise.
 	 */
@@ -830,6 +853,7 @@ public:
 	 *                      until the callback routine is called.
 	 *  @param len          The length of the data.
 	 *  @param cb           A pointer to the function which will be called when MeshLink has finished using the buffer.
+	 *  @param priv         A private pointer which was set by the application when submitting the buffer.
 	 *
 	 *  @return             True if the buffer was enqueued, false otherwise.
 	 */
@@ -846,6 +870,7 @@ public:
 	 *  @param fd           A file descriptor to which data will be written.
 	 *  @param len          The length of the data.
 	 *  @param cb           A pointer to the function which will be called when MeshLink has finished using the filedescriptor.
+	 *  @param priv         A private pointer which was set by the application when submitting the buffer.
 	 *
 	 *  @return             True if the buffer was enqueued, false otherwise.
 	 */
@@ -948,6 +973,15 @@ private:
 		that->log(level, message);
 	}
 
+	static void error_trampoline(meshlink_handle_t *handle, meshlink_errno_t meshlink_errno) {
+		if(!(handle->priv)) {
+			return;
+		}
+
+		meshlink::mesh *that = static_cast<mesh *>(handle->priv);
+		that->error(meshlink_errno);
+	}
+
 	static void connection_try_trampoline(meshlink_handle_t *handle, meshlink_node_t *peer) {
 		if(!(handle->priv)) {
 			return;