X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_setup.c;h=47ed32e0ec9e202b22cb1bf1e73433587b5f5eaf;hb=43d8f901c4bbb693643bb6f188c97dd28c1d0b0a;hp=896df4327269c73bd9696a891ecbca3c65d054c7;hpb=93f89bcae11e8d250831896bc5694ee8bd2ad22b;p=meshlink

diff --git a/src/net_setup.c b/src/net_setup.c
index 896df432..47ed32e0 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -1,6 +1,6 @@
 /*
     net_setup.c -- Setup.
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014-2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -31,19 +31,21 @@
 #include "route.h"
 #include "utils.h"
 #include "xalloc.h"
+#include "submesh.h"
 
-int autoconnect = 3;
-
-bool node_read_ecdsa_public_key(node_t *n) {
-	if(ecdsa_active(n->ecdsa))
+bool node_read_ecdsa_public_key(meshlink_handle_t *mesh, node_t *n) {
+	if(ecdsa_active(n->ecdsa)) {
 		return true;
+	}
 
 	splay_tree_t *config_tree;
 	char *p;
 
 	init_configuration(&config_tree);
-	if(!read_host_config(config_tree, n->name))
+
+	if(!read_host_config(mesh, config_tree, n->name)) {
 		goto exit;
+	}
 
 	/* First, check for simple ECDSAPublicKey statement */
 
@@ -57,16 +59,19 @@ exit:
 	return n->ecdsa;
 }
 
-bool read_ecdsa_public_key(connection_t *c) {
-	if(ecdsa_active(c->ecdsa))
+bool read_ecdsa_public_key(meshlink_handle_t *mesh, connection_t *c) {
+	if(ecdsa_active(c->ecdsa)) {
 		return true;
+	}
 
 	char *p;
 
 	if(!c->config_tree) {
 		init_configuration(&c->config_tree);
-		if(!read_host_config(c->config_tree, c->name))
+
+		if(!read_host_config(mesh, c->config_tree, c->name)) {
 			return false;
+		}
 	}
 
 	/* First, check for simple ECDSAPublicKey statement */
@@ -80,28 +85,29 @@ bool read_ecdsa_public_key(connection_t *c) {
 	return false;
 }
 
-static bool read_ecdsa_private_key(void) {
+bool read_ecdsa_private_key(meshlink_handle_t *mesh) {
 	FILE *fp;
 	char filename[PATH_MAX];
 
-	snprintf(filename,PATH_MAX, "%s" SLASH "ecdsa_key.priv", mesh->confbase);
-	fp = fopen(filename, "r");
+	snprintf(filename, PATH_MAX, "%s" SLASH "ecdsa_key.priv", mesh->confbase);
+	fp = fopen(filename, "rb");
 
 	if(!fp) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Error reading ECDSA private key file: %s", strerror(errno));
+		logger(mesh, MESHLINK_ERROR, "Error reading ECDSA private key file: %s", strerror(errno));
 		return false;
 	}
 
 	mesh->self->connection->ecdsa = ecdsa_read_pem_private_key(fp);
 	fclose(fp);
 
-	if(!mesh->self->connection->ecdsa)
-		logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file failed: %s", strerror(errno));
+	if(!mesh->self->connection->ecdsa) {
+		logger(mesh, MESHLINK_ERROR, "Reading ECDSA private key file failed: %s", strerror(errno));
+	}
 
 	return mesh->self->connection->ecdsa;
 }
 
-static bool read_invitation_key(void) {
+static bool read_invitation_key(meshlink_handle_t *mesh) {
 	FILE *fp;
 	char filename[PATH_MAX];
 
@@ -110,59 +116,200 @@ static bool read_invitation_key(void) {
 		mesh->invitation_key = NULL;
 	}
 
-	snprintf(filename,PATH_MAX, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", mesh->confbase);
+	snprintf(filename, PATH_MAX, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", mesh->confbase);
 
-	fp = fopen(filename, "r");
+	fp = fopen(filename, "rb");
 
 	if(fp) {
 		mesh->invitation_key = ecdsa_read_pem_private_key(fp);
 		fclose(fp);
-		if(!mesh->invitation_key)
-			logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file `%s' failed: %s", filename, strerror(errno));
+
+		if(!mesh->invitation_key) {
+			logger(mesh, MESHLINK_ERROR, "Reading ECDSA private key file `%s' failed: %s", filename, strerror(errno));
+		}
 	}
 
 	return mesh->invitation_key;
 }
 
-void load_all_nodes(void) {
+bool node_read_devclass(meshlink_handle_t *mesh, node_t *n) {
+
+	splay_tree_t *config_tree;
+	char *p;
+
+	init_configuration(&config_tree);
+
+	if(!read_host_config(mesh, config_tree, n->name)) {
+		goto exit;
+	}
+
+	if(get_config_string(lookup_config(config_tree, "DeviceClass"), &p)) {
+		n->devclass = atoi(p);
+		free(p);
+	}
+
+	if((int)n->devclass < 0 || n->devclass > _DEV_CLASS_MAX) {
+		n->devclass = _DEV_CLASS_MAX;
+	}
+
+exit:
+	exit_configuration(&config_tree);
+	return n->devclass != 0;
+}
+
+bool node_read_submesh(meshlink_handle_t *mesh, node_t *n) {
+
+	splay_tree_t *config_tree;
+	char *p;
+
+	init_configuration(&config_tree);
+
+	if(!read_host_config(mesh, config_tree, n->name)) {
+		goto exit;
+	}
+
+	if(get_config_string(lookup_config(config_tree, "SubMesh"), &p)) {
+		n->submesh = NULL;
+
+		for list_each(submesh_t, s, mesh->submeshes) {
+			if(!strcmp(p, s->name)) {
+				n->submesh = s;
+				break;
+			}
+		}
+
+		if(!n->submesh) {
+			n->submesh = (submesh_t *)meshlink_submesh_open(mesh, p);
+		}
+
+		free(p);
+	}
+
+exit:
+	exit_configuration(&config_tree);
+	return n->submesh != NULL;
+}
+
+bool node_write_devclass(meshlink_handle_t *mesh, node_t *n) {
+
+	if((int)n->devclass < 0 || n->devclass > _DEV_CLASS_MAX) {
+		return false;
+	}
+
+	bool result = false;
+
+	splay_tree_t *config_tree;
+	init_configuration(&config_tree);
+
+	// ignore read errors; in case the file does not exist we will create it
+	read_host_config(mesh, config_tree, n->name);
+
+	config_t *cnf = lookup_config(config_tree, "DeviceClass");
+
+	if(!cnf) {
+		cnf = new_config();
+		cnf->variable = xstrdup("DeviceClass");
+		config_add(config_tree, cnf);
+	}
+
+	set_config_int(cnf, n->devclass);
+
+	if(!write_host_config(mesh, config_tree, n->name)) {
+		goto fail;
+	}
+
+	result = true;
+
+fail:
+	exit_configuration(&config_tree);
+	return result;
+}
+
+bool node_write_submesh(meshlink_handle_t *mesh, node_t *n) {
+
+	if(!n->submesh) {
+		return false;
+	}
+
+	bool result = false;
+
+	splay_tree_t *config_tree;
+	init_configuration(&config_tree);
+
+	// ignore read errors; in case the file does not exist we will create it
+	read_host_config(mesh, config_tree, n->name);
+
+	config_t *cnf = lookup_config(config_tree, "SubMesh");
+
+	if(!cnf) {
+		cnf = new_config();
+		cnf->variable = xstrdup("SubMesh");
+		config_add(config_tree, cnf);
+	}
+
+	set_config_string(cnf, n->submesh->name);
+
+	if(!write_host_config(mesh, config_tree, n->name)) {
+		goto fail;
+	}
+
+	result = true;
+
+fail:
+	exit_configuration(&config_tree);
+	return result;
+}
+
+void load_all_nodes(meshlink_handle_t *mesh) {
 	DIR *dir;
 	struct dirent *ent;
 	char dname[PATH_MAX];
 
-	snprintf(dname,PATH_MAX, "%s" SLASH "hosts", mesh->confbase);
+	snprintf(dname, PATH_MAX, "%s" SLASH "hosts", mesh->confbase);
 	dir = opendir(dname);
+
 	if(!dir) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s", dname, strerror(errno));
+		logger(mesh, MESHLINK_ERROR, "Could not open %s: %s", dname, strerror(errno));
 		return;
 	}
 
 	while((ent = readdir(dir))) {
-		if(!check_id(ent->d_name))
+		if(!check_id(ent->d_name)) {
 			continue;
+		}
+
+		node_t *n = lookup_node(mesh, ent->d_name);
+
+		if(n) {
+			if(n == mesh->self && !n->submesh) {
+				node_read_submesh(mesh, n);
+			}
 
-		node_t *n = lookup_node(ent->d_name);
-		if(n)
 			continue;
+		}
 
 		n = new_node();
 		n->name = xstrdup(ent->d_name);
-		node_add(n);
+		node_read_devclass(mesh, n);
+		node_read_submesh(mesh, n);
+		node_add(mesh, n);
 	}
 
 	closedir(dir);
 }
 
 
-char *get_name(void) {
+char *get_name(meshlink_handle_t *mesh) {
 	char *name = NULL;
 
 	get_config_string(lookup_config(mesh->config, "Name"), &name);
 
-	if(!name)
+	if(!name) {
 		return NULL;
+	}
 
 	if(!check_id(name)) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Invalid name for mesh->self!");
+		logger(mesh, MESHLINK_ERROR, "Invalid name for mesh->self!");
 		free(name);
 		return NULL;
 	}
@@ -170,14 +317,13 @@ char *get_name(void) {
 	return name;
 }
 
-bool setup_myself_reloadable(void) {
+bool setup_myself_reloadable(meshlink_handle_t *mesh) {
 	mesh->localdiscovery = true;
 	keylifetime = 3600; // TODO: check if this can be removed as well
 	mesh->maxtimeout = 900;
-	autoconnect = 3;
 	mesh->self->options |= OPTION_PMTU_DISCOVERY;
 
-	read_invitation_key();
+	read_invitation_key(mesh);
 
 	return true;
 }
@@ -185,34 +331,42 @@ bool setup_myself_reloadable(void) {
 /*
   Add listening sockets.
 */
-static bool add_listen_address(char *address, bool bindto) {
+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, "*"))
+		if(!strcmp(address, "*")) {
 			*address = 0;
+		}
 	}
 
-	struct addrinfo *ai, hint = {0};
-	hint.ai_family = addressfamily;
-	hint.ai_socktype = SOCK_STREAM;
-	hint.ai_protocol = IPPROTO_TCP;
-	hint.ai_flags = AI_PASSIVE;
+	struct addrinfo *ai;
+
+	struct addrinfo hint = {
+		.ai_family = addressfamily,
+		.ai_socktype = SOCK_STREAM,
+		.ai_protocol = IPPROTO_TCP,
+		.ai_flags = AI_PASSIVE,
+	};
 
 	int err = getaddrinfo(address && *address ? address : NULL, port, &hint, &ai);
+
 	free(address);
 
 	if(err || !ai) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "getaddrinfo", err == EAI_SYSTEM ? strerror(err) : gai_strerror(err));
+		logger(mesh, MESHLINK_ERROR, "System call `%s' failed: %s", "getaddrinfo", err == EAI_SYSTEM ? strerror(err) : gai_strerror(err));
 		return false;
 	}
 
+	bool success = false;
+
 	for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
 		// Ignore duplicate addresses
 		bool found = false;
@@ -223,22 +377,24 @@ static bool add_listen_address(char *address, bool bindto) {
 				break;
 			}
 
-		if(found)
+		if(found) {
 			continue;
+		}
 
 		if(mesh->listen_sockets >= MAXSOCKETS) {
-			logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
+			logger(mesh, MESHLINK_ERROR, "Too many listening sockets");
 			return false;
 		}
 
 		int tcp_fd = setup_listen_socket((sockaddr_t *) aip->ai_addr);
 
-		if(tcp_fd < 0)
+		if(tcp_fd < 0) {
 			continue;
+		}
 
-		int udp_fd = setup_vpn_in_socket((sockaddr_t *) aip->ai_addr);
+		int udp_fd = setup_vpn_in_socket(mesh, (sockaddr_t *) aip->ai_addr);
 
-		if(tcp_fd < 0) {
+		if(udp_fd < 0) {
 			close(tcp_fd);
 			continue;
 		}
@@ -246,44 +402,50 @@ static bool add_listen_address(char *address, bool bindto) {
 		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->debug_level >= DEBUG_CONNECTIONS) {
+		if(mesh->log_level >= MESHLINK_INFO) {
 			char *hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
-			logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Listening on %s", hostname);
+			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);
 		mesh->listen_sockets++;
+		success = true;
 	}
 
 	freeaddrinfo(ai);
-	return true;
+	return success;
 }
 
 /*
   Configure node_t mesh->self and set up the local sockets (listen only)
 */
-bool setup_myself(void) {
-	char *name, *hostname, *cipher, *digest, *type;
+bool setup_myself(meshlink_handle_t *mesh) {
+	char *name;
 	char *address = NULL;
-	bool port_specified = false;
 
-	if(!(name = get_name())) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Name for tinc daemon required!");
+	if(!(name = get_name(mesh))) {
+		logger(mesh, MESHLINK_ERROR, "Name for MeshLink instance required!");
 		return false;
 	}
 
 	mesh->self = new_node();
 	mesh->self->connection = new_connection();
 	mesh->self->name = name;
+	mesh->self->devclass = mesh->devclass;
 	mesh->self->connection->name = xstrdup(name);
-	read_host_config(mesh->config, name);
+	read_host_config(mesh, mesh->config, name);
+
+	if(!get_config_string(lookup_config(mesh->config, "Port"), &mesh->myport)) {
+		int port = check_port(mesh);
 
-	if(!get_config_string(lookup_config(mesh->config, "Port"), &mesh->myport))
-		mesh->myport = xstrdup("655");
-	else
-		port_specified = true;
+		if(port == 0) {
+			return false;
+		}
+
+		xasprintf(&mesh->myport, "%d", port);
+	}
 
 	mesh->self->connection->options = 0;
 	mesh->self->connection->protocol_major = PROT_MAJOR;
@@ -291,16 +453,20 @@ bool setup_myself(void) {
 
 	mesh->self->options |= PROT_MINOR << 24;
 
-	if(!read_ecdsa_private_key())
+	if(!read_ecdsa_private_key(mesh)) {
 		return false;
+	}
 
 	/* Ensure mesh->myport is numeric */
 
 	if(!atoi(mesh->myport)) {
 		struct addrinfo *ai = str2addrinfo("localhost", mesh->myport, SOCK_DGRAM);
 		sockaddr_t sa;
-		if(!ai || !ai->ai_addr)
+
+		if(!ai || !ai->ai_addr) {
 			return false;
+		}
+
 		free(mesh->myport);
 		memcpy(&sa, ai->ai_addr, ai->ai_addrlen);
 		sockaddr2str(&sa, NULL, &mesh->myport);
@@ -308,8 +474,9 @@ bool setup_myself(void) {
 
 	/* Check some options */
 
-	if(!setup_myself_reloadable())
+	if(!setup_myself_reloadable(mesh)) {
 		return false;
+	}
 
 	/* Compression */
 
@@ -322,38 +489,45 @@ bool setup_myself(void) {
 	mesh->self->nexthop = mesh->self;
 	mesh->self->via = mesh->self;
 	mesh->self->status.reachable = true;
-	mesh->self->last_state_change = now.tv_sec;
-	node_add(mesh->self);
+	mesh->self->last_state_change = mesh->loop.now.tv_sec;
+
+	node_write_devclass(mesh, mesh->self);
+	node_add(mesh, mesh->self);
 
-	graph();
+	graph(mesh);
 
-	if(autoconnect)
-		load_all_nodes();
+	load_all_nodes(mesh);
 
 	/* Open sockets */
 
 	mesh->listen_sockets = 0;
-	int cfgs = 0;
 
-	if(!add_listen_address(address, NULL))
-		return false;
+	if(!add_listen_address(mesh, address, NULL)) {
+		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");
+
+			if(!mesh->myport) {
+				return false;
+			}
+
+			if(!add_listen_address(mesh, address, NULL)) {
+				return false;
+			}
+		} else {
+			return false;
+		}
+	}
 
 	if(!mesh->listen_sockets) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Unable to create any listening socket!");
+		logger(mesh, MESHLINK_ERROR, "Unable to create any listening socket!");
 		return false;
 	}
 
-	// TODO: require Port to be set? Or use "0" and use getsockname()?
-
-	if(!mesh->myport)
-		mesh->myport = xstrdup("655");
-
-	xasprintf(&mesh->self->hostname, "MYSELF port %s", mesh->myport);
-	mesh->self->connection->hostname = xstrdup(mesh->self->hostname);
-
 	/* Done. */
 
-	mesh->last_config_check = now.tv_sec;
+	mesh->last_config_check = mesh->loop.now.tv_sec;
 
 	return true;
 }
@@ -361,18 +535,20 @@ bool setup_myself(void) {
 /*
   initialize network
 */
-bool setup_network(void) {
-	init_connections();
-	init_nodes();
-	init_edges();
-	init_requests();
+bool setup_network(meshlink_handle_t *mesh) {
+	init_connections(mesh);
+	init_submeshes(mesh);
+	init_nodes(mesh);
+	init_edges(mesh);
+	init_requests(mesh);
 
 	mesh->pinginterval = 60;
 	mesh->pingtimeout = 5;
 	maxoutbufsize = 10 * MTU;
 
-	if(!setup_myself())
+	if(!setup_myself(mesh)) {
 		return false;
+	}
 
 	return true;
 }
@@ -380,19 +556,22 @@ bool setup_network(void) {
 /*
   close all open network connections
 */
-void close_network_connections(void) {
-	for(list_node_t *node = mesh->connections->head, *next; node; node = next) {
-		next = node->next;
-		connection_t *c = node->data;
-		c->outgoing = NULL;
-		terminate_connection(c, false);
+void close_network_connections(meshlink_handle_t *mesh) {
+	if(mesh->connections) {
+		for(list_node_t *node = mesh->connections->head, *next; node; node = next) {
+			next = node->next;
+			connection_t *c = node->data;
+			c->outgoing = NULL;
+			terminate_connection(mesh, c, false);
+		}
 	}
 
-	if(mesh->outgoings)
+	if(mesh->outgoings) {
 		list_delete_list(mesh->outgoings);
+	}
 
 	if(mesh->self && mesh->self->connection) {
-		terminate_connection(mesh->self->connection, false);
+		terminate_connection(mesh, mesh->self->connection, false);
 		free_connection(mesh->self->connection);
 	}
 
@@ -403,12 +582,14 @@ void close_network_connections(void) {
 		close(mesh->listen_socket[i].udp.fd);
 	}
 
-	exit_requests();
-	exit_edges();
-	exit_nodes();
-	exit_connections();
+	exit_requests(mesh);
+	exit_edges(mesh);
+	exit_nodes(mesh);
+	exit_connections(mesh);
 
-	if(mesh->myport) free(mesh->myport);
+	if(mesh->myport) {
+		free(mesh->myport);
+	}
 
 	return;
 }