X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmeshlink.c;h=a9e1b551df18362848fc68a7b5e1f7a0f1192850;hb=46079ef8d3adcb693d593cfd362879eb8e4709df;hp=27fe945cd734af7d26ddfc17579a05bda74b0626;hpb=d5112a0a5e7036957f22c604e767e33c4b10b775;p=meshlink

diff --git a/src/meshlink.c b/src/meshlink.c
index 27fe945c..a9e1b551 100644
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -575,7 +575,7 @@ static bool finalize_join(meshlink_handle_t *mesh, const void *buf, uint16_t len
 
 	char *name = packmsg_get_str_dup(&in);
 	packmsg_skip_element(&in); /* submesh */
-	int32_t devclass = packmsg_get_int32(&in);
+	dev_class_t devclass = packmsg_get_int32(&in);
 	uint32_t count = packmsg_get_array(&in);
 
 	if(!name) {
@@ -661,6 +661,11 @@ static bool finalize_join(meshlink_handle_t *mesh, const void *buf, uint16_t len
 		}
 	}
 
+	/* Ensure the configuration directory metadata is on disk */
+	if(!config_sync(mesh, "current")) {
+		return false;
+	}
+
 	sptps_send_record(&(mesh->sptps), 1, ecdsa_get_public_key(mesh->private_key), 32);
 
 	logger(mesh, MESHLINK_DEBUG, "Configuration stored in: %s\n", mesh->confbase);
@@ -890,6 +895,11 @@ static bool meshlink_setup(meshlink_handle_t *mesh) {
 		return false;
 	}
 
+	/* Ensure the configuration directory metadata is on disk */
+	if(!config_sync(mesh, "current")) {
+		return false;
+	}
+
 	if(!main_config_lock(mesh)) {
 		logger(NULL, MESHLINK_ERROR, "Cannot lock main config file\n");
 		meshlink_errno = MESHLINK_ESTORAGE;
@@ -1012,7 +1022,7 @@ meshlink_open_params_t *meshlink_open_params_init(const char *confbase, const ch
 		}
 	}
 
-	if((int)devclass < 0 || devclass > _DEV_CLASS_MAX) {
+	if(devclass < 0 || devclass >= DEV_CLASS_COUNT) {
 		logger(NULL, MESHLINK_ERROR, "Invalid devclass given!\n");
 		meshlink_errno = MESHLINK_EINVAL;
 		return NULL;
@@ -1150,6 +1160,14 @@ void meshlink_open_params_free(meshlink_open_params_t *params) {
 	free(params);
 }
 
+/// Device class traits
+static const dev_class_traits_t default_class_traits[DEV_CLASS_COUNT] = {
+	{ .pingtimeout = 5, .pinginterval = 60, .min_connects = 3, .max_connects = 10000, .edge_weight = 1 }, // DEV_CLASS_BACKBONE
+	{ .pingtimeout = 5, .pinginterval = 60, .min_connects = 3, .max_connects = 100, .edge_weight = 3 },   // DEV_CLASS_STATIONARY
+	{ .pingtimeout = 5, .pinginterval = 60, .min_connects = 3, .max_connects = 3, .edge_weight = 6 },     // DEV_CLASS_PORTABLE
+	{ .pingtimeout = 5, .pinginterval = 60, .min_connects = 1, .max_connects = 1, .edge_weight = 9 },     // DEV_CLASS_UNKNOWN
+};
+
 meshlink_handle_t *meshlink_open(const char *confbase, const char *name, const char *appname, dev_class_t devclass) {
 	if(!confbase || !*confbase) {
 		logger(NULL, MESHLINK_ERROR, "No confbase given!\n");
@@ -1237,7 +1255,7 @@ meshlink_handle_t *meshlink_open_ex(const meshlink_open_params_t *params) {
 		}
 	}
 
-	if((int)params->devclass < 0 || params->devclass > _DEV_CLASS_MAX) {
+	if(params->devclass < 0 || params->devclass >= DEV_CLASS_COUNT) {
 		logger(NULL, MESHLINK_ERROR, "Invalid devclass given!\n");
 		meshlink_errno = MESHLINK_EINVAL;
 		return NULL;
@@ -1261,6 +1279,10 @@ meshlink_handle_t *meshlink_open_ex(const meshlink_open_params_t *params) {
 	mesh->invitation_timeout = 604800; // 1 week
 	mesh->netns = params->netns;
 	mesh->submeshes = NULL;
+	mesh->log_cb = global_log_cb;
+	mesh->log_level = global_log_level;
+
+	memcpy(mesh->dev_class_traits, default_class_traits, sizeof(default_class_traits));
 
 	if(usingname) {
 		mesh->name = xstrdup(params->name);
@@ -1919,7 +1941,7 @@ static bool search_node_by_submesh(const node_t *node, const void *condition) {
 }
 
 meshlink_node_t **meshlink_get_all_nodes_by_dev_class(meshlink_handle_t *mesh, dev_class_t devclass, meshlink_node_t **nodes, size_t *nmemb) {
-	if(!mesh || ((int)devclass < 0) || (devclass > _DEV_CLASS_MAX) || !nmemb) {
+	if(!mesh || devclass < 0 || devclass >= DEV_CLASS_COUNT || !nmemb) {
 		meshlink_errno = MESHLINK_EINVAL;
 		return NULL;
 	}
@@ -2137,9 +2159,6 @@ bool meshlink_set_port(meshlink_handle_t *mesh, int port) {
 	free(mesh->myport);
 	xasprintf(&mesh->myport, "%d", port);
 
-	/* Write meshlink.conf with the updated port number */
-	write_main_config_files(mesh);
-
 	/* Close down the network. This also deletes mesh->self. */
 	close_network_connections(mesh);
 
@@ -2160,6 +2179,17 @@ bool meshlink_set_port(meshlink_handle_t *mesh, int port) {
 		rval = true;
 	}
 
+	/* Rebuild our own list of recent addresses */
+	memset(mesh->self->recent, 0, sizeof(mesh->self->recent));
+	add_local_addresses(mesh);
+
+	/* Write meshlink.conf with the updated port number */
+	write_main_config_files(mesh);
+
+	if(!config_sync(mesh, "current")) {
+		return false;
+	}
+
 done:
 	pthread_mutex_unlock(&(mesh->mesh_mutex));
 
@@ -2699,6 +2729,10 @@ bool meshlink_import(meshlink_handle_t *mesh, const char *data) {
 		return false;
 	}
 
+	if(!config_sync(mesh, "current")) {
+		return false;
+	}
+
 	return true;
 }
 
@@ -2728,6 +2762,8 @@ void meshlink_blacklist(meshlink_handle_t *mesh, meshlink_node_t *node) {
 
 	n->status.blacklisted = true;
 	node_write_config(mesh, n);
+	config_sync(mesh, "current");
+
 	logger(mesh, MESHLINK_DEBUG, "Blacklisted %s.\n", node->name);
 
 	//Immediately terminate any connections we have with the blacklisted node
@@ -2771,6 +2807,7 @@ void meshlink_whitelist(meshlink_handle_t *mesh, meshlink_node_t *node) {
 
 	n->status.blacklisted = false;
 	node_write_config(mesh, n);
+	config_sync(mesh, "current");
 
 	pthread_mutex_unlock(&(mesh->mesh_mutex));
 	return;
@@ -2807,6 +2844,18 @@ static bool channel_pre_accept(struct utcp *utcp, uint16_t port) {
 	return mesh->channel_accept_cb;
 }
 
+static void aio_signal(meshlink_handle_t *mesh, meshlink_channel_t *channel, meshlink_aio_buffer_t *aio) {
+	if(aio->data) {
+		if(aio->cb.buffer) {
+			aio->cb.buffer(mesh, channel, aio->data, aio->len, aio->priv);
+		}
+	} else {
+		if(aio->cb.fd) {
+			aio->cb.fd(mesh, channel, aio->fd, aio->done, aio->priv);
+		}
+	}
+}
+
 static ssize_t channel_recv(struct utcp_connection *connection, const void *data, size_t len) {
 	meshlink_channel_t *channel = connection->priv;
 
@@ -2819,8 +2868,48 @@ static ssize_t channel_recv(struct utcp_connection *connection, const void *data
 
 	if(n->status.destroyed) {
 		meshlink_channel_close(mesh, channel);
-	} else if(channel->receive_cb) {
-		channel->receive_cb(mesh, channel, data, len);
+		return len;
+	}
+
+	const char *p = data;
+	size_t left = len;
+
+	while(channel->aio_receive) {
+		meshlink_aio_buffer_t *aio = channel->aio_receive;
+		size_t todo = aio->len - aio->done;
+
+		if(todo > left) {
+			todo = left;
+		}
+
+		if(aio->data) {
+			memcpy((char *)aio->data + aio->done, p, todo);
+		} else {
+			ssize_t result = write(aio->fd, p, todo);
+
+			if(result > 0) {
+				todo = result;
+			}
+		}
+
+		aio->done += todo;
+
+		if(aio->done == aio->len) {
+			channel->aio_receive = aio->next;
+			aio_signal(mesh, channel, aio);
+			free(aio);
+		}
+
+		p += todo;
+		left -= todo;
+
+		if(!left && len) {
+			return len;
+		}
+	}
+
+	if(channel->receive_cb) {
+		channel->receive_cb(mesh, channel, p, left);
 	}
 
 	return len;
@@ -2890,17 +2979,39 @@ static void channel_poll(struct utcp_connection *connection, size_t len) {
 
 	node_t *n = channel->node;
 	meshlink_handle_t *mesh = n->mesh;
-	meshlink_aio_buffer_t *aio = channel->aio;
+	meshlink_aio_buffer_t *aio = channel->aio_send;
 
 	if(aio) {
 		/* We at least one AIO buffer. Send as much as possible form the first buffer. */
 		size_t left = aio->len - aio->done;
+		ssize_t sent;
 
 		if(len > left) {
 			len = left;
 		}
 
-		ssize_t sent = utcp_send(connection, (char *)aio->data + aio->done, len);
+		if(aio->data) {
+			sent = utcp_send(connection, (char *)aio->data + aio->done, len);
+		} else {
+			char buf[65536];
+			size_t todo = utcp_get_sndbuf_free(connection);
+
+			if(todo > left) {
+				todo = left;
+			}
+
+			if(todo > sizeof(buf)) {
+				todo = sizeof(buf);
+			}
+
+			ssize_t result = read(aio->fd, buf, todo);
+
+			if(result > 0) {
+				sent = utcp_send(connection, buf, result);
+			} else {
+				sent = result;
+			}
+		}
 
 		if(sent >= 0) {
 			aio->done += sent;
@@ -2908,12 +3019,8 @@ static void channel_poll(struct utcp_connection *connection, size_t len) {
 
 		/* If the buffer is now completely sent, call the callback and dispose of it. */
 		if(aio->done >= aio->len) {
-			channel->aio = aio->next;
-
-			if(aio->cb) {
-				aio->cb(mesh, channel, aio->data, aio->len, aio->priv);
-			}
-
+			channel->aio_send = aio->next;
+			aio_signal(mesh, channel, aio);
 			free(aio);
 		}
 	} else {
@@ -2928,7 +3035,7 @@ static void channel_poll(struct utcp_connection *connection, size_t len) {
 void meshlink_set_channel_poll_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, meshlink_channel_poll_cb_t cb) {
 	(void)mesh;
 	channel->poll_cb = cb;
-	utcp_set_poll_cb(channel->c, (cb || channel->aio) ? channel_poll : NULL);
+	utcp_set_poll_cb(channel->c, (cb || channel->aio_send) ? channel_poll : NULL);
 }
 
 void meshlink_set_channel_accept_cb(meshlink_handle_t *mesh, meshlink_channel_accept_cb_t cb) {
@@ -2950,6 +3057,32 @@ void meshlink_set_channel_accept_cb(meshlink_handle_t *mesh, meshlink_channel_ac
 	pthread_mutex_unlock(&mesh->mesh_mutex);
 }
 
+void meshlink_set_channel_sndbuf(meshlink_handle_t *mesh, meshlink_channel_t *channel, size_t size) {
+	(void)mesh;
+
+	if(!channel) {
+		meshlink_errno = MESHLINK_EINVAL;
+		return;
+	}
+
+	pthread_mutex_lock(&mesh->mesh_mutex);
+	utcp_set_sndbuf(channel->c, size);
+	pthread_mutex_unlock(&mesh->mesh_mutex);
+}
+
+void meshlink_set_channel_rcvbuf(meshlink_handle_t *mesh, meshlink_channel_t *channel, size_t size) {
+	(void)mesh;
+
+	if(!channel) {
+		meshlink_errno = MESHLINK_EINVAL;
+		return;
+	}
+
+	pthread_mutex_lock(&mesh->mesh_mutex);
+	utcp_set_rcvbuf(channel->c, size);
+	pthread_mutex_unlock(&mesh->mesh_mutex);
+}
+
 meshlink_channel_t *meshlink_channel_open_ex(meshlink_handle_t *mesh, meshlink_node_t *node, uint16_t port, meshlink_channel_receive_cb_t cb, const void *data, size_t len, uint32_t flags) {
 	if(data || len) {
 		abort();        // TODO: handle non-NULL data
@@ -3013,13 +3146,15 @@ void meshlink_channel_close(meshlink_handle_t *mesh, meshlink_channel_t *channel
 	utcp_close(channel->c);
 
 	/* Clean up any outstanding AIO buffers. */
-	for(meshlink_aio_buffer_t *aio = channel->aio, *next; aio; aio = next) {
+	for(meshlink_aio_buffer_t *aio = channel->aio_send, *next; aio; aio = next) {
 		next = aio->next;
+		aio_signal(mesh, channel, aio);
+		free(aio);
+	}
 
-		if(aio->cb) {
-			aio->cb(mesh, channel, aio->data, aio->len, aio->priv);
-		}
-
+	for(meshlink_aio_buffer_t *aio = channel->aio_receive, *next; aio; aio = next) {
+		next = aio->next;
+		aio_signal(mesh, channel, aio);
 		free(aio);
 	}
 
@@ -3051,7 +3186,7 @@ ssize_t meshlink_channel_send(meshlink_handle_t *mesh, meshlink_channel_t *chann
 	pthread_mutex_lock(&mesh->mesh_mutex);
 
 	/* Disallow direct calls to utcp_send() while we still have AIO active. */
-	if(channel->aio) {
+	if(channel->aio_send) {
 		retval = 0;
 	} else {
 		retval = utcp_send(channel->c, data, len);
@@ -3080,13 +3215,50 @@ bool meshlink_channel_aio_send(meshlink_handle_t *mesh, meshlink_channel_t *chan
 	meshlink_aio_buffer_t *aio = xzalloc(sizeof(*aio));
 	aio->data = data;
 	aio->len = len;
-	aio->cb = cb;
+	aio->cb.buffer = cb;
+	aio->priv = priv;
+
+	pthread_mutex_lock(&mesh->mesh_mutex);
+
+	/* Append the AIO buffer descriptor to the end of the chain */
+	meshlink_aio_buffer_t **p = &channel->aio_send;
+
+	while(*p) {
+		p = &(*p)->next;
+	}
+
+	*p = aio;
+
+	/* Ensure the poll callback is set, and call it right now to push data if possible */
+	utcp_set_poll_cb(channel->c, channel_poll);
+	channel_poll(channel->c, len);
+
+	pthread_mutex_unlock(&mesh->mesh_mutex);
+
+	return true;
+}
+
+bool meshlink_channel_aio_fd_send(meshlink_handle_t *mesh, meshlink_channel_t *channel, int fd, size_t len, meshlink_aio_fd_cb_t cb, void *priv) {
+	if(!mesh || !channel) {
+		meshlink_errno = MESHLINK_EINVAL;
+		return false;
+	}
+
+	if(!len || fd == -1) {
+		meshlink_errno = MESHLINK_EINVAL;
+		return false;
+	}
+
+	meshlink_aio_buffer_t *aio = xzalloc(sizeof(*aio));
+	aio->fd = fd;
+	aio->len = len;
+	aio->cb.fd = cb;
 	aio->priv = priv;
 
 	pthread_mutex_lock(&mesh->mesh_mutex);
 
 	/* Append the AIO buffer descriptor to the end of the chain */
-	meshlink_aio_buffer_t **p = &channel->aio;
+	meshlink_aio_buffer_t **p = &channel->aio_send;
 
 	while(*p) {
 		p = &(*p)->next;
@@ -3103,6 +3275,72 @@ bool meshlink_channel_aio_send(meshlink_handle_t *mesh, meshlink_channel_t *chan
 	return true;
 }
 
+bool meshlink_channel_aio_receive(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *data, size_t len, meshlink_aio_cb_t cb, void *priv) {
+	if(!mesh || !channel) {
+		meshlink_errno = MESHLINK_EINVAL;
+		return false;
+	}
+
+	if(!len || !data) {
+		meshlink_errno = MESHLINK_EINVAL;
+		return false;
+	}
+
+	meshlink_aio_buffer_t *aio = xzalloc(sizeof(*aio));
+	aio->data = data;
+	aio->len = len;
+	aio->cb.buffer = cb;
+	aio->priv = priv;
+
+	pthread_mutex_lock(&mesh->mesh_mutex);
+
+	/* Append the AIO buffer descriptor to the end of the chain */
+	meshlink_aio_buffer_t **p = &channel->aio_receive;
+
+	while(*p) {
+		p = &(*p)->next;
+	}
+
+	*p = aio;
+
+	pthread_mutex_unlock(&mesh->mesh_mutex);
+
+	return true;
+}
+
+bool meshlink_channel_aio_fd_receive(meshlink_handle_t *mesh, meshlink_channel_t *channel, int fd, size_t len, meshlink_aio_fd_cb_t cb, void *priv) {
+	if(!mesh || !channel) {
+		meshlink_errno = MESHLINK_EINVAL;
+		return false;
+	}
+
+	if(!len || fd == -1) {
+		meshlink_errno = MESHLINK_EINVAL;
+		return false;
+	}
+
+	meshlink_aio_buffer_t *aio = xzalloc(sizeof(*aio));
+	aio->fd = fd;
+	aio->len = len;
+	aio->cb.fd = cb;
+	aio->priv = priv;
+
+	pthread_mutex_lock(&mesh->mesh_mutex);
+
+	/* Append the AIO buffer descriptor to the end of the chain */
+	meshlink_aio_buffer_t **p = &channel->aio_receive;
+
+	while(*p) {
+		p = &(*p)->next;
+	}
+
+	*p = aio;
+
+	pthread_mutex_unlock(&mesh->mesh_mutex);
+
+	return true;
+}
+
 uint32_t meshlink_channel_get_flags(meshlink_handle_t *mesh, meshlink_channel_t *channel) {
 	if(!mesh || !channel) {
 		meshlink_errno = MESHLINK_EINVAL;
@@ -3182,6 +3420,23 @@ end:
 #endif
 }
 
+void meshlink_set_dev_class_timeouts(meshlink_handle_t *mesh, dev_class_t devclass, int pinginterval, int pingtimeout) {
+	if(!mesh || devclass < 0 || devclass >= DEV_CLASS_COUNT) {
+		meshlink_errno = EINVAL;
+		return;
+	}
+
+	if(pinginterval < 1 || pingtimeout < 1 || pingtimeout > pinginterval) {
+		meshlink_errno = EINVAL;
+		return;
+	}
+
+	pthread_mutex_lock(&mesh->mesh_mutex);
+	mesh->dev_class_traits[devclass].pinginterval = pinginterval;
+	mesh->dev_class_traits[devclass].pingtimeout = pingtimeout;
+	pthread_mutex_unlock(&mesh->mesh_mutex);
+}
+
 void handle_network_change(meshlink_handle_t *mesh, bool online) {
 	(void)online;
 
@@ -3202,11 +3457,3 @@ static void __attribute__((constructor)) meshlink_init(void) {
 static void __attribute__((destructor)) meshlink_exit(void) {
 	crypto_exit();
 }
-
-/// Device class traits
-const dev_class_traits_t dev_class_traits[_DEV_CLASS_MAX + 1] = {
-	{ .min_connects = 3, .max_connects = 10000, .edge_weight = 1 }, // DEV_CLASS_BACKBONE
-	{ .min_connects = 3, .max_connects = 100, .edge_weight = 3 },   // DEV_CLASS_STATIONARY
-	{ .min_connects = 3, .max_connects = 3, .edge_weight = 6 },             // DEV_CLASS_PORTABLE
-	{ .min_connects = 1, .max_connects = 1, .edge_weight = 9 },             // DEV_CLASS_UNKNOWN
-};