X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_setup.c;h=10fb37b0005c5df5ae73b35bf33a66a9591796ac;hb=b5a8aaba0ae78e93f8a972c9c7911fc2bc664b4e;hp=b02dbd14d246d87164843ac6a4011ddf45c3e8f2;hpb=196806f90f40fcc0cf727abd4bed6bc5aefff5ff;p=meshlink

diff --git a/src/net_setup.c b/src/net_setup.c
index b02dbd14..10fb37b0 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
@@ -33,15 +33,18 @@
 #include "xalloc.h"
 
 bool node_read_ecdsa_public_key(meshlink_handle_t *mesh, node_t *n) {
-	if(ecdsa_active(n->ecdsa))
+	if(ecdsa_active(n->ecdsa)) {
 		return true;
+	}
 
 	splay_tree_t *config_tree;
 	char *p;
 
 	init_configuration(&config_tree);
-	if(!read_host_config(mesh, config_tree, n->name))
+
+	if(!read_host_config(mesh, config_tree, n->name)) {
 		goto exit;
+	}
 
 	/* First, check for simple ECDSAPublicKey statement */
 
@@ -56,15 +59,18 @@ exit:
 }
 
 bool read_ecdsa_public_key(meshlink_handle_t *mesh, connection_t *c) {
-	if(ecdsa_active(c->ecdsa))
+	if(ecdsa_active(c->ecdsa)) {
 		return true;
+	}
 
 	char *p;
 
 	if(!c->config_tree) {
 		init_configuration(&c->config_tree);
-		if(!read_host_config(mesh, c->config_tree, c->name))
+
+		if(!read_host_config(mesh, c->config_tree, c->name)) {
 			return false;
+		}
 	}
 
 	/* First, check for simple ECDSAPublicKey statement */
@@ -82,7 +88,7 @@ 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);
+	snprintf(filename, PATH_MAX, "%s" SLASH "ecdsa_key.priv", mesh->confbase);
 	fp = fopen(filename, "rb");
 
 	if(!fp) {
@@ -93,8 +99,9 @@ bool read_ecdsa_private_key(meshlink_handle_t *mesh) {
 	mesh->self->connection->ecdsa = ecdsa_read_pem_private_key(fp);
 	fclose(fp);
 
-	if(!mesh->self->connection->ecdsa)
+	if(!mesh->self->connection->ecdsa) {
 		logger(mesh, MESHLINK_ERROR, "Reading ECDSA private key file failed: %s", strerror(errno));
+	}
 
 	return mesh->self->connection->ecdsa;
 }
@@ -108,15 +115,17 @@ static bool read_invitation_key(meshlink_handle_t *mesh) {
 		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, "rb");
 
 	if(fp) {
 		mesh->invitation_key = ecdsa_read_pem_private_key(fp);
 		fclose(fp);
-		if(!mesh->invitation_key)
+
+		if(!mesh->invitation_key) {
 			logger(mesh, MESHLINK_ERROR, "Reading ECDSA private key file `%s' failed: %s", filename, strerror(errno));
+		}
 	}
 
 	return mesh->invitation_key;
@@ -128,16 +137,19 @@ bool node_read_devclass(meshlink_handle_t *mesh, node_t *n) {
 	char *p;
 
 	init_configuration(&config_tree);
-	if(!read_host_config(mesh, config_tree, n->name))
+
+	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(n->devclass < 0 || n->devclass > _DEV_CLASS_MAX)
+	if((int)n->devclass < 0 || n->devclass > _DEV_CLASS_MAX) {
 		n->devclass = _DEV_CLASS_MAX;
+	}
 
 exit:
 	exit_configuration(&config_tree);
@@ -146,8 +158,9 @@ exit:
 
 bool node_write_devclass(meshlink_handle_t *mesh, node_t *n) {
 
-	if(n->devclass < 0 || n->devclass > _DEV_CLASS_MAX)
+	if((int)n->devclass < 0 || n->devclass > _DEV_CLASS_MAX) {
 		return false;
+	}
 
 	bool result = false;
 
@@ -157,7 +170,7 @@ bool node_write_devclass(meshlink_handle_t *mesh, node_t *n) {
 	// 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");
+	config_t *cnf = lookup_config(config_tree, "DeviceClass");
 
 	if(!cnf) {
 		cnf = new_config();
@@ -167,8 +180,9 @@ bool node_write_devclass(meshlink_handle_t *mesh, node_t *n) {
 
 	set_config_int(cnf, n->devclass);
 
-	if(!write_host_config(mesh, config_tree, n->name))
+	if(!write_host_config(mesh, config_tree, n->name)) {
 		goto fail;
+	}
 
 	result = true;
 
@@ -182,20 +196,24 @@ void load_all_nodes(meshlink_handle_t *mesh) {
 	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(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) {
 			continue;
+		}
 
 		n = new_node();
 		n->name = xstrdup(ent->d_name);
@@ -212,8 +230,9 @@ char *get_name(meshlink_handle_t *mesh) {
 
 	get_config_string(lookup_config(mesh->config, "Name"), &name);
 
-	if(!name)
+	if(!name) {
 		return NULL;
+	}
 
 	if(!check_id(name)) {
 		logger(mesh, MESHLINK_ERROR, "Invalid name for mesh->self!");
@@ -243,22 +262,28 @@ static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bind
 
 	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) {
@@ -266,6 +291,8 @@ static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bind
 		return false;
 	}
 
+	bool success = false;
+
 	for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
 		// Ignore duplicate addresses
 		bool found = false;
@@ -276,8 +303,9 @@ static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bind
 				break;
 			}
 
-		if(found)
+		if(found) {
 			continue;
+		}
 
 		if(mesh->listen_sockets >= MAXSOCKETS) {
 			logger(mesh, MESHLINK_ERROR, "Too many listening sockets");
@@ -286,8 +314,9 @@ static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bind
 
 		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(mesh, (sockaddr_t *) aip->ai_addr);
 
@@ -308,10 +337,11 @@ static bool add_listen_address(meshlink_handle_t *mesh, char *address, bool bind
 		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;
 }
 
 /*
@@ -334,8 +364,13 @@ bool setup_myself(meshlink_handle_t *mesh) {
 	read_host_config(mesh, mesh->config, name);
 
 	if(!get_config_string(lookup_config(mesh->config, "Port"), &mesh->myport)) {
-		logger(mesh, MESHLINK_ERROR, "Port for MeshLink instance required!");
-		return false;
+		int port = check_port(mesh);
+
+		if(port == 0) {
+			return false;
+		}
+
+		xasprintf(&mesh->myport, "%d", port);
 	}
 
 	mesh->self->connection->options = 0;
@@ -344,16 +379,20 @@ bool setup_myself(meshlink_handle_t *mesh) {
 
 	mesh->self->options |= PROT_MINOR << 24;
 
-	if(!read_ecdsa_private_key(mesh))
+	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);
@@ -361,8 +400,9 @@ bool setup_myself(meshlink_handle_t *mesh) {
 
 	/* Check some options */
 
-	if(!setup_myself_reloadable(mesh))
+	if(!setup_myself_reloadable(mesh)) {
 		return false;
+	}
 
 	/* Compression */
 
@@ -389,16 +429,21 @@ bool setup_myself(meshlink_handle_t *mesh) {
 	mesh->listen_sockets = 0;
 
 	if(!add_listen_address(mesh, address, NULL)) {
-		if(!strcmp(mesh->myport, "0")) {
-			logger(mesh, MESHLINK_WARNING, "Could not bind to port %s, asking OS to choose one for us", mesh->myport);
+		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)
+
+			if(!mesh->myport) {
 				return false;
-			if(!add_listen_address(mesh, address, NULL))
+			}
+
+			if(!add_listen_address(mesh, address, NULL)) {
 				return false;
-		} else
+			}
+		} else {
 			return false;
+		}
 	}
 
 	if(!mesh->listen_sockets) {
@@ -406,9 +451,6 @@ bool setup_myself(meshlink_handle_t *mesh) {
 		return false;
 	}
 
-	xasprintf(&mesh->self->hostname, "MYSELF port %s", mesh->myport);
-	mesh->self->connection->hostname = xstrdup(mesh->self->hostname);
-
 	/* Done. */
 
 	mesh->last_config_check = mesh->loop.now.tv_sec;
@@ -429,8 +471,9 @@ bool setup_network(meshlink_handle_t *mesh) {
 	mesh->pingtimeout = 5;
 	maxoutbufsize = 10 * MTU;
 
-	if(!setup_myself(mesh))
+	if(!setup_myself(mesh)) {
 		return false;
+	}
 
 	return true;
 }
@@ -448,8 +491,9 @@ void close_network_connections(meshlink_handle_t *mesh) {
 		}
 	}
 
-	if(mesh->outgoings)
+	if(mesh->outgoings) {
 		list_delete_list(mesh->outgoings);
+	}
 
 	if(mesh->self && mesh->self->connection) {
 		terminate_connection(mesh, mesh->self->connection, false);
@@ -468,7 +512,9 @@ void close_network_connections(meshlink_handle_t *mesh) {
 	exit_nodes(mesh);
 	exit_connections(mesh);
 
-	if(mesh->myport) free(mesh->myport);
+	if(mesh->myport) {
+		free(mesh->myport);
+	}
 
 	return;
 }