X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink.c;h=90d64648ae8945384ac110e1ac3a716ab2a27c72;hb=99b4836a1e463a225a003623cce09f462d77f4d2;hp=42573c8ffa6f68837fb1e06f3a567f0baefbdbd9;hpb=c023ad12147aa88810629c110ea6b1ab94267196;p=meshlink

diff --git a/src/meshlink.c b/src/meshlink.c
index 42573c8f..90d64648 100644
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -333,7 +333,7 @@ void remove_duplicate_hostnames(char *host[], char *port[], int n) {
 			break;
 		}
 
-		if(found) {
+		if(found || !is_valid_hostname(host[i])) {
 			free(host[i]);
 			free(port[i]);
 			host[i] = NULL;
@@ -417,7 +417,7 @@ static char *get_my_hostname(meshlink_handle_t *mesh, uint32_t flags) {
 			char resolved_port[NI_MAXSERV];
 			err = getnameinfo(ai_in->ai_addr, ai_in->ai_addrlen, resolved_host, sizeof resolved_host, resolved_port, sizeof resolved_port, NI_NUMERICSERV);
 
-			if(err) {
+			if(err || !is_valid_hostname(resolved_host)) {
 				freeaddrinfo(ai_in);
 				continue;
 			}
@@ -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);
@@ -841,6 +846,7 @@ static struct timeval idle(event_loop_t *loop, void *data) {
 // Get our local address(es) by simulating connecting to an Internet host.
 static void add_local_addresses(meshlink_handle_t *mesh) {
 	struct sockaddr_storage sn;
+	sn.ss_family = AF_UNKNOWN;
 	socklen_t sl = sizeof(sn);
 
 	// IPv4 example.org
@@ -890,6 +896,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;
@@ -1003,16 +1014,17 @@ meshlink_open_params_t *meshlink_open_params_init(const char *confbase, const ch
 
 	if(!name || !*name) {
 		logger(NULL, MESHLINK_ERROR, "No name given!\n");
-		//return NULL;
-	} else { //check name only if there is a name != NULL
-		if(!check_id(name)) {
-			logger(NULL, MESHLINK_ERROR, "Invalid name given!\n");
-			meshlink_errno = MESHLINK_EINVAL;
-			return NULL;
-		}
+		meshlink_errno = MESHLINK_EINVAL;
+		return NULL;
+	};
+
+	if(!check_id(name)) {
+		logger(NULL, MESHLINK_ERROR, "Invalid name given!\n");
+		meshlink_errno = MESHLINK_EINVAL;
+		return NULL;
 	}
 
-	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 +1162,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 +1198,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 +1216,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 +1259,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 +1283,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);
@@ -1578,6 +1604,12 @@ void meshlink_close(meshlink_handle_t *mesh) {
 		close(mesh->netns);
 	}
 
+	for(vpn_packet_t *packet; (packet = meshlink_queue_pop(&mesh->outpacketqueue));) {
+		free(packet);
+	}
+
+	meshlink_queue_exit(&mesh->outpacketqueue);
+
 	free(mesh->name);
 	free(mesh->appname);
 	free(mesh->confbase);
@@ -1648,6 +1680,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;
@@ -1741,6 +1784,8 @@ void meshlink_send_from_queue(event_loop_t *loop, meshlink_handle_t *mesh) {
 	mesh->self->in_packets++;
 	mesh->self->in_bytes += packet->len;
 	route(mesh, mesh->self, packet);
+
+	free(packet);
 }
 
 ssize_t meshlink_get_pmtu(meshlink_handle_t *mesh, meshlink_node_t *destination) {
@@ -1919,7 +1964,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 +2150,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 +2188,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);
 
@@ -2154,12 +2202,21 @@ bool meshlink_set_port(meshlink_handle_t *mesh, int port) {
 		meshlink_errno = MESHLINK_ESTORAGE;
 		free_node(mesh->self);
 		mesh->self = NULL;
+		goto done;
 	} else if(!setup_network(mesh)) {
 		meshlink_errno = MESHLINK_ENETWORK;
-	} else {
-		rval = true;
+		goto done;
 	}
 
+	/* 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);
+
+	rval = config_sync(mesh, "current");
+
 done:
 	pthread_mutex_unlock(&(mesh->mesh_mutex));
 
@@ -2268,7 +2325,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)) {
@@ -2693,12 +2751,18 @@ bool meshlink_import(meshlink_handle_t *mesh, const char *data) {
 
 	pthread_mutex_unlock(&(mesh->mesh_mutex));
 
+	free(buf);
+
 	if(!packmsg_done(&in)) {
 		logger(mesh, MESHLINK_ERROR, "Invalid data\n");
 		meshlink_errno = MESHLINK_EPEER;
 		return false;
 	}
 
+	if(!config_sync(mesh, "current")) {
+		return false;
+	}
+
 	return true;
 }
 
@@ -2728,6 +2792,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 +2837,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;
@@ -2996,9 +3067,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) {
@@ -3056,6 +3133,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) {
@@ -3064,12 +3143,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;
 	}
 
@@ -3078,6 +3159,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);
@@ -3097,7 +3180,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) {
@@ -3106,6 +3191,8 @@ 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. */
@@ -3121,6 +3208,8 @@ void meshlink_channel_close(meshlink_handle_t *mesh, meshlink_channel_t *channel
 		free(aio);
 	}
 
+	pthread_mutex_unlock(&mesh->mesh_mutex);
+
 	free(channel);
 }
 
@@ -3339,6 +3428,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) {
@@ -3383,6 +3482,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;
 
@@ -3403,11 +3519,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
-};