X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_setup.c;h=4cff1a5ee83d679ff952fe181cf0c84fbe738d07;hb=0b6635bd9460ba2f9aeafddd2aef79929cd417a1;hp=905e442d6aed296a27d74c01dcedd320f23e60e2;hpb=fa05f996c5500c056a36c1d43e33a407f876643c;p=meshlink

diff --git a/src/net_setup.c b/src/net_setup.c
index 905e442d..4cff1a5e 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -36,7 +36,7 @@
 
 /// Helper function to start parsing a host config file
 static bool node_get_config(meshlink_handle_t *mesh, node_t *n, config_t *config, packmsg_input_t *in) {
-	if(!config_read(mesh, n->name, config)) {
+	if(!config_read(mesh, "current", n->name, config, mesh->config_key)) {
 		return false;
 	}
 
@@ -46,6 +46,7 @@ static bool node_get_config(meshlink_handle_t *mesh, node_t *n, config_t *config
 	uint32_t version = packmsg_get_uint32(in);
 
 	if(version != MESHLINK_CONFIG_VERSION) {
+		logger(mesh, MESHLINK_ERROR, "Invalid config file for node %s", n->name);
 		config_free(config);
 		return false;
 	}
@@ -53,7 +54,8 @@ static bool node_get_config(meshlink_handle_t *mesh, node_t *n, config_t *config
 	const char *name;
 	uint32_t len = packmsg_get_str_raw(in, &name);
 
-	if(len != strlen(n->name) || strncmp(name, n->name, len)) {
+	if(len != strlen(n->name) || !name || strncmp(name, n->name, len)) {
+		logger(mesh, MESHLINK_ERROR, "Invalid config file for node %s", n->name);
 		config_free(config);
 		return false;
 	}
@@ -61,43 +63,6 @@ static bool node_get_config(meshlink_handle_t *mesh, node_t *n, config_t *config
 	return true;
 }
 
-/// Read device class, blacklist status and submesh from a host config file. Used at startup when reading all host config files.
-bool node_read_partial(meshlink_handle_t *mesh, node_t *n) {
-	config_t config;
-	packmsg_input_t in;
-
-	if(!node_get_config(mesh, n, &config, &in)) {
-		return false;
-	}
-
-	char *submesh_name = packmsg_get_str_dup(&in);
-
-	if(!strcmp(submesh_name, CORE_MESH)) {
-		free(submesh_name);
-		n->submesh = NULL;
-	} else {
-		n->submesh = lookup_or_create_submesh(mesh, submesh_name);
-		free(submesh_name);
-
-		if(!n->submesh) {
-			config_free(&config);
-			return false;
-		}
-	}
-
-	int32_t devclass = packmsg_get_int32(&in);
-	bool blacklisted = packmsg_get_bool(&in);
-	config_free(&config);
-
-	if(!packmsg_input_ok(&in) || devclass < 0 || devclass > _DEV_CLASS_MAX) {
-		return false;
-	}
-
-	n->devclass = devclass;
-	n->status.blacklisted = blacklisted;
-	return true;
-}
-
 /// Read the public key from a host config file. Used whenever we need to start an SPTPS session.
 bool node_read_public_key(meshlink_handle_t *mesh, node_t *n) {
 	if(ecdsa_active(n->ecdsa)) {
@@ -124,23 +89,78 @@ bool node_read_public_key(meshlink_handle_t *mesh, node_t *n) {
 	}
 
 	n->ecdsa = ecdsa_set_public_key(key);
+
+	// While we are at it, read known address information
+	if(!n->canonical_address) {
+		n->canonical_address = packmsg_get_str_dup(&in);
+	} else {
+		packmsg_skip_element(&in);
+	}
+
+	// Append any known addresses in the config file to the list we currently have
+	uint32_t known_count = 0;
+
+	for(uint32_t i = 0; i < MAX_RECENT; i++) {
+		if(n->recent[i].sa.sa_family) {
+			known_count++;
+		}
+	}
+
+	uint32_t count = packmsg_get_array(&in);
+
+	for(uint32_t i = 0; i < count; i++) {
+		if(i < MAX_RECENT - known_count) {
+			n->recent[i + known_count] = packmsg_get_sockaddr(&in);
+		} else {
+			packmsg_skip_element(&in);
+		}
+	}
+
+	time_t last_reachable = packmsg_get_int64(&in);
+	time_t last_unreachable = packmsg_get_int64(&in);
+
+	if(!n->last_reachable) {
+		n->last_reachable = last_reachable;
+	}
+
+	if(!n->last_unreachable) {
+		n->last_unreachable = last_unreachable;
+	}
+
 	config_free(&config);
 	return true;
 }
 
-/// Read the full host config file. Used whenever we need to start an SPTPS session.
-bool node_read_full(meshlink_handle_t *mesh, node_t *n) {
+/// Fill in node details from a config blob.
+bool node_read_from_config(meshlink_handle_t *mesh, node_t *n, const config_t *config) {
 	if(n->canonical_address) {
 		return true;
 	}
 
-	config_t config;
-	packmsg_input_t in;
+	packmsg_input_t in = {config->buf, config->len};
+	uint32_t version = packmsg_get_uint32(&in);
 
-	if(!node_get_config(mesh, n, &config, &in)) {
+	if(version != MESHLINK_CONFIG_VERSION) {
+		return false;
+	}
+
+	char *name = packmsg_get_str_dup(&in);
+
+	if(!name) {
 		return false;
 	}
 
+	if(n->name) {
+		if(strcmp(n->name, name)) {
+			free(name);
+			return false;
+		}
+
+		free(name);
+	} else {
+		n->name = name;
+	}
+
 	char *submesh_name = packmsg_get_str_dup(&in);
 
 	if(!strcmp(submesh_name, CORE_MESH)) {
@@ -155,37 +175,43 @@ bool node_read_full(meshlink_handle_t *mesh, node_t *n) {
 		}
 	}
 
-	packmsg_get_int32(&in); /* devclass */
-	packmsg_get_bool(&in); /* blacklisted */
+	n->devclass = packmsg_get_int32(&in);
+	n->status.blacklisted = packmsg_get_bool(&in);
 	const void *key;
-	uint32_t len = packmsg_get_bin_raw(&in, &key); /* public key */
+	uint32_t len = packmsg_get_bin_raw(&in, &key);
 
-	if(len != 32) {
-		return false;
-	}
+	if(len) {
+		if(len != 32) {
+			return false;
+		}
 
-	if(!ecdsa_active(n->ecdsa)) {
-		n->ecdsa = ecdsa_set_public_key(key);
+		if(!ecdsa_active(n->ecdsa)) {
+			n->ecdsa = ecdsa_set_public_key(key);
+		}
 	}
 
 	n->canonical_address = packmsg_get_str_dup(&in);
-
 	uint32_t count = packmsg_get_array(&in);
 
-	if(count > 5) {
-		count = 5;
-	}
-
 	for(uint32_t i = 0; i < count; i++) {
-		n->recent[i] = packmsg_get_sockaddr(&in);
+		if(i < MAX_RECENT) {
+			n->recent[i] = packmsg_get_sockaddr(&in);
+		} else {
+			packmsg_skip_element(&in);
+		}
 	}
 
-	config_free(&config);
+	n->last_reachable = packmsg_get_int64(&in);
+	n->last_unreachable = packmsg_get_int64(&in);
 
 	return packmsg_done(&in);
 }
 
 bool node_write_config(meshlink_handle_t *mesh, node_t *n) {
+	if(!mesh->confbase) {
+		return true;
+	}
+
 	uint8_t buf[4096];
 	packmsg_output_t out = {buf, sizeof(buf)};
 
@@ -193,7 +219,6 @@ bool node_write_config(meshlink_handle_t *mesh, node_t *n) {
 	packmsg_add_str(&out, n->name);
 	packmsg_add_str(&out, n->submesh ? n->submesh->name : CORE_MESH);
 	packmsg_add_int32(&out, n->devclass);
-	assert(n->devclass != 3);
 	packmsg_add_bool(&out, n->status.blacklisted);
 
 	if(ecdsa_active(n->ecdsa)) {
@@ -206,7 +231,7 @@ bool node_write_config(meshlink_handle_t *mesh, node_t *n) {
 
 	uint32_t count = 0;
 
-	for(uint32_t i = 0; i < 5; i++) {
+	for(uint32_t i = 0; i < MAX_RECENT; i++) {
 		if(n->recent[i].sa.sa_family) {
 			count++;
 		} else {
@@ -220,78 +245,76 @@ bool node_write_config(meshlink_handle_t *mesh, node_t *n) {
 		packmsg_add_sockaddr(&out, &n->recent[i]);
 	}
 
+	packmsg_add_int64(&out, n->last_reachable);
+	packmsg_add_int64(&out, n->last_unreachable);
+
 	if(!packmsg_output_ok(&out)) {
+		meshlink_errno = MESHLINK_EINTERNAL;
 		return false;
 	}
 
 	config_t config = {buf, packmsg_output_size(&out, buf)};
-	return config_write(mesh, n->name, &config);
+
+	if(!config_write(mesh, "current", n->name, &config, mesh->config_key)) {
+		call_error_cb(mesh, MESHLINK_ESTORAGE);
+		return false;
+	}
+
+	return true;
 }
 
-void load_all_nodes(meshlink_handle_t *mesh) {
-	DIR *dir;
-	struct dirent *ent;
-	char dname[PATH_MAX];
+static bool load_node(meshlink_handle_t *mesh, const char *name, void *priv) {
+	(void)priv;
 
-	snprintf(dname, PATH_MAX, "%s" SLASH "hosts", mesh->confbase);
-	dir = opendir(dname);
+	if(!check_id(name)) {
+		return true;
+	}
 
-	if(!dir) {
-		logger(mesh, MESHLINK_ERROR, "Could not open %s: %s", dname, strerror(errno));
-		return;
+	node_t *n = lookup_node(mesh, name);
+
+	if(n) {
+		return true;
 	}
 
-	while((ent = readdir(dir))) {
-		if(!check_id(ent->d_name)) {
-			continue;
-		}
+	n = new_node();
+	n->name = xstrdup(name);
 
-		node_t *n = lookup_node(mesh, ent->d_name);
+	config_t config;
+	packmsg_input_t in;
 
-		if(n) {
-			continue;
-		}
+	if(!node_get_config(mesh, n, &config, &in)) {
+		free_node(n);
+		return false;
+	}
 
-		n = new_node();
-		n->name = xstrdup(ent->d_name);
-		node_read_partial(mesh, n);
-		node_add(mesh, n);
+	if(!node_read_from_config(mesh, n, &config)) {
+		logger(mesh, MESHLINK_ERROR, "Invalid config file for node %s", n->name);
+		config_free(&config);
+		free_node(n);
+		return false;
 	}
 
-	closedir(dir);
+	config_free(&config);
+
+	node_add(mesh, n);
+
+	return true;
 }
 
 /*
   Add listening sockets.
 */
-static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bindto) {
-	char *port = mesh->myport;
-
-	if(address) {
-		char *space = strchr(address, ' ');
-
-		if(space) {
-			*space++ = 0;
-			port = space;
-		}
-
-		if(!strcmp(address, "*")) {
-			*address = 0;
-		}
-	}
-
+static bool add_listen_sockets(meshlink_handle_t *mesh) {
 	struct addrinfo *ai;
 
 	struct addrinfo hint = {
-		.ai_family = addressfamily,
+		.ai_family = AF_UNSPEC,
 		.ai_socktype = SOCK_STREAM,
 		.ai_protocol = IPPROTO_TCP,
 		.ai_flags = AI_PASSIVE,
 	};
 
-	int err = getaddrinfo(address && *address ? address : NULL, port, &hint, &ai);
-
-	free(address);
+	int err = getaddrinfo(NULL, mesh->myport, &hint, &ai);
 
 	if(err || !ai) {
 		logger(mesh, MESHLINK_ERROR, "System call `%s' failed: %s", "getaddrinfo", err == EAI_SYSTEM ? strerror(err) : gai_strerror(err));
@@ -304,11 +327,12 @@ static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bind
 		// Ignore duplicate addresses
 		bool found = false;
 
-		for(int i = 0; i < mesh->listen_sockets; i++)
+		for(int i = 0; i < mesh->listen_sockets; i++) {
 			if(!memcmp(&mesh->listen_socket[i].sa, aip->ai_addr, aip->ai_addrlen)) {
 				found = true;
 				break;
 			}
+		}
 
 		if(found) {
 			continue;
@@ -319,35 +343,86 @@ static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bind
 			return false;
 		}
 
-		int tcp_fd = setup_listen_socket((sockaddr_t *) aip->ai_addr);
+		/* Try to bind to TCP */
+
+		int tcp_fd = socket(aip->ai_family, SOCK_STREAM, IPPROTO_TCP);
 
-		if(tcp_fd < 0) {
+		if(tcp_fd == -1) {
 			continue;
 		}
 
-		int udp_fd = setup_vpn_in_socket(mesh, (sockaddr_t *) aip->ai_addr);
+		if(bind(tcp_fd, aip->ai_addr, aip->ai_addrlen)) {
+			closesocket(tcp_fd);
 
-		if(udp_fd < 0) {
-			close(tcp_fd);
-			continue;
+			if(errno == EADDRINUSE) {
+				/* If this port is in use for any address family, avoid it. */
+				success = false;
+				break;
+			} else {
+				continue;
+			}
+		}
+
+		if(!setup_listen_socket(mesh, tcp_fd, aip->ai_family)) {
+			closesocket(tcp_fd);
+			success = false;
+			break;
+		}
+
+		/* If TCP worked, then we require that UDP works as well. */
+
+		int udp_fd = socket(aip->ai_family, SOCK_DGRAM, IPPROTO_UDP);
+
+		if(udp_fd == -1) {
+			closesocket(tcp_fd);
+			success = false;
+			break;
+		}
+
+		if(bind(udp_fd, aip->ai_addr, aip->ai_addrlen) || !setup_vpn_in_socket(mesh, udp_fd, aip->ai_family)) {
+			closesocket(tcp_fd);
+			closesocket(udp_fd);
+			success = false;
+			break;
 		}
 
 		io_add(&mesh->loop, &mesh->listen_socket[mesh->listen_sockets].tcp, handle_new_meta_connection, &mesh->listen_socket[mesh->listen_sockets], tcp_fd, IO_READ);
 		io_add(&mesh->loop, &mesh->listen_socket[mesh->listen_sockets].udp, handle_incoming_vpn_data, &mesh->listen_socket[mesh->listen_sockets], udp_fd, IO_READ);
 
-		if(mesh->log_level >= MESHLINK_INFO) {
+		if(mesh->log_level <= MESHLINK_INFO) {
 			char *hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
 			logger(mesh, MESHLINK_INFO, "Listening on %s", hostname);
 			free(hostname);
 		}
 
-		mesh->listen_socket[mesh->listen_sockets].bindto = bindto;
 		memcpy(&mesh->listen_socket[mesh->listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
+		memcpy(&mesh->listen_socket[mesh->listen_sockets].broadcast_sa, aip->ai_addr, aip->ai_addrlen);
+
+		if(aip->ai_family == AF_INET6) {
+			mesh->listen_socket[mesh->listen_sockets].broadcast_sa.in6.sin6_addr.s6_addr[0x0] = 0xff;
+			mesh->listen_socket[mesh->listen_sockets].broadcast_sa.in6.sin6_addr.s6_addr[0x1] = 0x02;
+			mesh->listen_socket[mesh->listen_sockets].broadcast_sa.in6.sin6_addr.s6_addr[0xf] = 0x01;
+		} else {
+			mesh->listen_socket[mesh->listen_sockets].broadcast_sa.in.sin_addr.s_addr = 0xffffffff;
+		}
+
 		mesh->listen_sockets++;
 		success = true;
 	}
 
 	freeaddrinfo(ai);
+
+	if(!success) {
+		for(int i = 0; i < mesh->listen_sockets; i++) {
+			io_del(&mesh->loop, &mesh->listen_socket[i].tcp);
+			io_del(&mesh->loop, &mesh->listen_socket[i].udp);
+			close(mesh->listen_socket[i].tcp.fd);
+			close(mesh->listen_socket[i].udp.fd);
+		}
+
+		mesh->listen_sockets = 0;
+	}
+
 	return success;
 }
 
@@ -357,39 +432,33 @@ static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bind
 bool setup_myself(meshlink_handle_t *mesh) {
 	/* Set some defaults */
 
-	mesh->localdiscovery = true;
-	keylifetime = 3600; // TODO: check if this can be removed as well
 	mesh->maxtimeout = 900;
-	mesh->self->options |= OPTION_PMTU_DISCOVERY;
 
 	/* Done */
 
 	mesh->self->nexthop = mesh->self;
-	mesh->self->via = mesh->self;
-	mesh->self->status.reachable = true;
-	mesh->self->last_state_change = mesh->loop.now.tv_sec;
 
 	node_add(mesh, mesh->self);
 
-	graph(mesh);
-
-	load_all_nodes(mesh);
+	if(!config_scan_all(mesh, "current", "hosts", load_node, NULL)) {
+		logger(mesh, MESHLINK_WARNING, "Could not scan all host config files");
+	}
 
 	/* Open sockets */
 
 	mesh->listen_sockets = 0;
 
-	if(!add_listen_address(mesh, NULL, NULL)) {
+	if(!add_listen_sockets(mesh)) {
 		if(strcmp(mesh->myport, "0")) {
-			logger(mesh, MESHLINK_INFO, "Could not bind to port %s, asking OS to choose one for us", mesh->myport);
-			free(mesh->myport);
-			mesh->myport = strdup("0");
+			logger(mesh, MESHLINK_WARNING, "Could not bind to port %s, trying to find an alternative port", mesh->myport);
 
-			if(!mesh->myport) {
-				return false;
+			if(!check_port(mesh)) {
+				logger(mesh, MESHLINK_WARNING, "Could not bind to any port, trying to bind to port 0");
+				free(mesh->myport);
+				mesh->myport = xstrdup("0");
 			}
 
-			if(!add_listen_address(mesh, NULL, NULL)) {
+			if(!add_listen_sockets(mesh)) {
 				return false;
 			}
 		} else {
@@ -405,6 +474,7 @@ bool setup_myself(meshlink_handle_t *mesh) {
 	/* Done. */
 
 	mesh->last_config_check = mesh->loop.now.tv_sec;
+	mesh->last_unreachable = mesh->loop.now.tv_sec;
 
 	return true;
 }
@@ -419,10 +489,6 @@ bool setup_network(meshlink_handle_t *mesh) {
 	init_edges(mesh);
 	init_requests(mesh);
 
-	mesh->pinginterval = 60;
-	mesh->pingtimeout = 5;
-	maxoutbufsize = 10 * MTU;
-
 	if(!setup_myself(mesh)) {
 		return false;
 	}
@@ -453,11 +519,13 @@ void close_network_connections(meshlink_handle_t *mesh) {
 	exit_requests(mesh);
 	exit_edges(mesh);
 	exit_nodes(mesh);
+	exit_submeshes(mesh);
 	exit_connections(mesh);
 
-	if(mesh->myport) {
-		free(mesh->myport);
-	}
+	free(mesh->myport);
+	mesh->myport = NULL;
+
+	mesh->self = NULL;
 
 	return;
 }