X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink.c;h=0826487674f2467d24c8d201968e8e815b1a702b;hb=53eb15a631a1733ee7dca4d858e29c6f893555e1;hp=1b643503f6a9416d72528571697d93a0213e33dd;hpb=57114d942004e8a34ff22aadc0c620a0aabbb423;p=meshlink

diff --git a/src/meshlink.c b/src/meshlink.c
index 1b643503..08264876 100644
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -514,7 +514,7 @@ static bool try_bind(int port) {
 	return true;
 }
 
-int check_port(meshlink_handle_t *mesh) {
+static int check_port(meshlink_handle_t *mesh) {
 	for(int i = 0; i < 1000; i++) {
 		int port = 0x1000 + (rand() & 0x7fff);
 
@@ -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");
@@ -1178,7 +1196,8 @@ meshlink_handle_t *meshlink_open_encrypted(const char *confbase, const char *nam
 	}
 
 	/* Create a temporary struct on the stack, to avoid allocating and freeing one. */
-	meshlink_open_params_t params = {NULL};
+	meshlink_open_params_t params;
+	memset(&params, 0, sizeof(params));
 
 	params.confbase = (char *)confbase;
 	params.name = (char *)name;
@@ -1195,7 +1214,8 @@ meshlink_handle_t *meshlink_open_encrypted(const char *confbase, const char *nam
 
 meshlink_handle_t *meshlink_open_ephemeral(const char *name, const char *appname, dev_class_t devclass) {
 	/* Create a temporary struct on the stack, to avoid allocating and freeing one. */
-	meshlink_open_params_t params = {NULL};
+	meshlink_open_params_t params;
+	memset(&params, 0, sizeof(params));
 
 	params.name = (char *)name;
 	params.appname = (char *)appname;
@@ -1237,7 +1257,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 +1281,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);
@@ -1648,6 +1672,17 @@ void meshlink_set_node_status_cb(meshlink_handle_t *mesh, meshlink_node_status_c
 	pthread_mutex_unlock(&(mesh->mesh_mutex));
 }
 
+void meshlink_set_node_pmtu_cb(meshlink_handle_t *mesh, meshlink_node_pmtu_cb_t cb) {
+	if(!mesh) {
+		meshlink_errno = MESHLINK_EINVAL;
+		return;
+	}
+
+	pthread_mutex_lock(&(mesh->mesh_mutex));
+	mesh->node_pmtu_cb = cb;
+	pthread_mutex_unlock(&(mesh->mesh_mutex));
+}
+
 void meshlink_set_node_duplicate_cb(meshlink_handle_t *mesh, meshlink_node_duplicate_cb_t cb) {
 	if(!mesh) {
 		meshlink_errno = MESHLINK_EINVAL;
@@ -1919,7 +1954,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;
 	}
@@ -2105,7 +2140,13 @@ int meshlink_get_port(meshlink_handle_t *mesh) {
 		return -1;
 	}
 
-	return atoi(mesh->myport);
+	int port;
+
+	pthread_mutex_lock(&(mesh->mesh_mutex));
+	port = atoi(mesh->myport);
+	pthread_mutex_unlock(&(mesh->mesh_mutex));
+
+	return port;
 }
 
 bool meshlink_set_port(meshlink_handle_t *mesh, int port) {
@@ -2137,9 +2178,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 +2198,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));
 
@@ -2268,7 +2317,8 @@ char *meshlink_invite_ex(meshlink_handle_t *mesh, meshlink_submesh_t *submesh, c
 	 * Note: make sure we only add config files of nodes that are in the core mesh or the same submesh,
 	 * and are not blacklisted.
 	 */
-	config_t configs[5] = {NULL};
+	config_t configs[5];
+	memset(configs, 0, sizeof(configs));
 	int count = 0;
 
 	if(config_read(mesh, "current", mesh->self->name, &configs[count], mesh->config_key)) {
@@ -2699,6 +2749,10 @@ bool meshlink_import(meshlink_handle_t *mesh, const char *data) {
 		return false;
 	}
 
+	if(!config_sync(mesh, "current")) {
+		return false;
+	}
+
 	return true;
 }
 
@@ -2728,6 +2782,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 +2827,11 @@ void meshlink_whitelist(meshlink_handle_t *mesh, meshlink_node_t *node) {
 
 	n->status.blacklisted = false;
 	node_write_config(mesh, n);
+	config_sync(mesh, "current");
+
+	if(n->status.reachable) {
+		update_node_status(mesh, n);
+	}
 
 	pthread_mutex_unlock(&(mesh->mesh_mutex));
 	return;
@@ -2807,6 +2868,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;
 
@@ -2833,16 +2906,21 @@ static ssize_t channel_recv(struct utcp_connection *connection, const void *data
 			todo = left;
 		}
 
-		memcpy((char *)aio->data + aio->done, p, todo);
+		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;
-
-			if(aio->cb) {
-				aio->cb(mesh, channel, aio->data, aio->len, aio->priv);
-			}
-
+			aio_signal(mesh, channel, aio);
 			free(aio);
 		}
 
@@ -2930,12 +3008,34 @@ static void channel_poll(struct utcp_connection *connection, size_t len) {
 	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;
@@ -2944,11 +3044,7 @@ 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_send = aio->next;
-
-			if(aio->cb) {
-				aio->cb(mesh, channel, aio->data, aio->len, aio->priv);
-			}
-
+			aio_signal(mesh, channel, aio);
 			free(aio);
 		}
 	} else {
@@ -2961,9 +3057,15 @@ 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;
+	if(!mesh || !channel) {
+		meshlink_errno = MESHLINK_EINVAL;
+		return;
+	}
+
+	pthread_mutex_lock(&mesh->mesh_mutex);
 	channel->poll_cb = cb;
 	utcp_set_poll_cb(channel->c, (cb || channel->aio_send) ? channel_poll : NULL);
+	pthread_mutex_unlock(&mesh->mesh_mutex);
 }
 
 void meshlink_set_channel_accept_cb(meshlink_handle_t *mesh, meshlink_channel_accept_cb_t cb) {
@@ -2985,6 +3087,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
@@ -2995,6 +3123,8 @@ meshlink_channel_t *meshlink_channel_open_ex(meshlink_handle_t *mesh, meshlink_n
 		return NULL;
 	}
 
+	pthread_mutex_lock(&mesh->mesh_mutex);
+
 	node_t *n = (node_t *)node;
 
 	if(!n->utcp) {
@@ -3003,12 +3133,14 @@ meshlink_channel_t *meshlink_channel_open_ex(meshlink_handle_t *mesh, meshlink_n
 
 		if(!n->utcp) {
 			meshlink_errno = errno == ENOMEM ? MESHLINK_ENOMEM : MESHLINK_EINTERNAL;
+			pthread_mutex_unlock(&mesh->mesh_mutex);
 			return NULL;
 		}
 	}
 
 	if(n->status.blacklisted) {
 		logger(mesh, MESHLINK_ERROR, "Cannot open a channel with blacklisted node\n");
+		pthread_mutex_unlock(&mesh->mesh_mutex);
 		return NULL;
 	}
 
@@ -3017,6 +3149,8 @@ meshlink_channel_t *meshlink_channel_open_ex(meshlink_handle_t *mesh, meshlink_n
 	channel->receive_cb = cb;
 	channel->c = utcp_connect_ex(n->utcp, port, channel_recv, channel, flags);
 
+	pthread_mutex_unlock(&mesh->mesh_mutex);
+
 	if(!channel->c) {
 		meshlink_errno = errno == ENOMEM ? MESHLINK_ENOMEM : MESHLINK_EINTERNAL;
 		free(channel);
@@ -3036,7 +3170,9 @@ void meshlink_channel_shutdown(meshlink_handle_t *mesh, meshlink_channel_t *chan
 		return;
 	}
 
+	pthread_mutex_lock(&mesh->mesh_mutex);
 	utcp_shutdown(channel->c, direction);
+	pthread_mutex_unlock(&mesh->mesh_mutex);
 }
 
 void meshlink_channel_close(meshlink_handle_t *mesh, meshlink_channel_t *channel) {
@@ -3045,29 +3181,25 @@ void meshlink_channel_close(meshlink_handle_t *mesh, meshlink_channel_t *channel
 		return;
 	}
 
+	pthread_mutex_lock(&mesh->mesh_mutex);
+
 	utcp_close(channel->c);
 
 	/* Clean up any outstanding AIO buffers. */
 	for(meshlink_aio_buffer_t *aio = channel->aio_send, *next; aio; aio = next) {
 		next = aio->next;
-
-		if(aio->cb) {
-			aio->cb(mesh, channel, aio->data, aio->len, aio->priv);
-		}
-
+		aio_signal(mesh, channel, aio);
 		free(aio);
 	}
 
 	for(meshlink_aio_buffer_t *aio = channel->aio_receive, *next; aio; aio = next) {
 		next = aio->next;
-
-		if(aio->cb) {
-			aio->cb(mesh, channel, aio->data, aio->len, aio->priv);
-		}
-
+		aio_signal(mesh, channel, aio);
 		free(aio);
 	}
 
+	pthread_mutex_unlock(&mesh->mesh_mutex);
+
 	free(channel);
 }
 
@@ -3125,7 +3257,44 @@ 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);
@@ -3162,7 +3331,40 @@ bool meshlink_channel_aio_receive(meshlink_handle_t *mesh, meshlink_channel_t *c
 	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_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);
@@ -3216,6 +3418,16 @@ void update_node_status(meshlink_handle_t *mesh, node_t *n) {
 	if(mesh->node_status_cb) {
 		mesh->node_status_cb(mesh, (meshlink_node_t *)n, n->status.reachable && !n->status.blacklisted);
 	}
+
+	if(mesh->node_pmtu_cb) {
+		mesh->node_pmtu_cb(mesh, (meshlink_node_t *)n, n->minmtu);
+	}
+}
+
+void update_node_pmtu(meshlink_handle_t *mesh, node_t *n) {
+	if(mesh->node_pmtu_cb && !n->status.blacklisted) {
+		mesh->node_pmtu_cb(mesh, (meshlink_node_t *)n, n->minmtu);
+	}
 }
 
 void handle_duplicate_node(meshlink_handle_t *mesh, node_t *n) {
@@ -3260,6 +3472,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;
 
@@ -3280,11 +3509,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
-};