X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_setup.c;h=896df4327269c73bd9696a891ecbca3c65d054c7;hb=93f89bcae11e8d250831896bc5694ee8bd2ad22b;hp=63f02753679e4867450e88408a538f0a60ddc510;hpb=1e08f518b26db292ad81ce44fc0df06f4df3a869;p=meshlink

diff --git a/src/net_setup.c b/src/net_setup.c
index 63f02753..896df432 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -19,10 +19,8 @@
 
 #include "system.h"
 
-#include "cipher.h"
 #include "conf.h"
 #include "connection.h"
-#include "digest.h"
 #include "ecdsa.h"
 #include "graph.h"
 #include "logger.h"
@@ -34,15 +32,7 @@
 #include "utils.h"
 #include "xalloc.h"
 
-char *myport;
-
-char *proxyhost;
-char *proxyport;
-char *proxyuser;
-char *proxypass;
-proxytype_t proxytype;
-int autoconnect;
-bool disablebuggypeers;
+int autoconnect = 3;
 
 bool node_read_ecdsa_public_key(node_t *n) {
 	if(ecdsa_active(n->ecdsa))
@@ -92,11 +82,10 @@ bool read_ecdsa_public_key(connection_t *c) {
 
 static bool read_ecdsa_private_key(void) {
 	FILE *fp;
-	char *fname;
+	char filename[PATH_MAX];
 
-	xasprintf(&fname, "%s" SLASH "ecdsa_key.priv", confbase);
-	fp = fopen(fname, "r");
-	free(fname);
+	snprintf(filename,PATH_MAX, "%s" SLASH "ecdsa_key.priv", mesh->confbase);
+	fp = fopen(filename, "r");
 
 	if(!fp) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Error reading ECDSA private key file: %s", strerror(errno));
@@ -114,50 +103,36 @@ static bool read_ecdsa_private_key(void) {
 
 static bool read_invitation_key(void) {
 	FILE *fp;
-	char *fname;
+	char filename[PATH_MAX];
 
-	if(invitation_key) {
-		ecdsa_free(invitation_key);
-		invitation_key = NULL;
+	if(mesh->invitation_key) {
+		ecdsa_free(mesh->invitation_key);
+		mesh->invitation_key = NULL;
 	}
 
-	xasprintf(&fname, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", confbase);
+	snprintf(filename,PATH_MAX, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", mesh->confbase);
 
-	fp = fopen(fname, "r");
+	fp = fopen(filename, "r");
 
 	if(fp) {
-		invitation_key = ecdsa_read_pem_private_key(fp);
+		mesh->invitation_key = ecdsa_read_pem_private_key(fp);
 		fclose(fp);
-		if(!invitation_key)
-			logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file `%s' failed: %s", fname, strerror(errno));
+		if(!mesh->invitation_key)
+			logger(DEBUG_ALWAYS, LOG_ERR, "Reading ECDSA private key file `%s' failed: %s", filename, strerror(errno));
 	}
 
-	free(fname);
-	return invitation_key;
-}
-
-static timeout_t keyexpire_timeout;
-
-static void keyexpire_handler(void *data) {
-	regenerate_key();
-	timeout_set(data, &(struct timeval){keylifetime, rand() % 100000});
-}
-
-void regenerate_key(void) {
-	logger(DEBUG_STATUS, LOG_INFO, "Expiring symmetric keys");
-	send_key_changed();
+	return mesh->invitation_key;
 }
 
 void load_all_nodes(void) {
 	DIR *dir;
 	struct dirent *ent;
-	char *dname;
+	char dname[PATH_MAX];
 
-	xasprintf(&dname, "%s" SLASH "hosts", 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));
-		free(dname);
 		return;
 	}
 
@@ -181,7 +156,7 @@ void load_all_nodes(void) {
 char *get_name(void) {
 	char *name = NULL;
 
-	get_config_string(lookup_config(config_tree, "Name"), &name);
+	get_config_string(lookup_config(mesh->config, "Name"), &name);
 
 	if(!name)
 		return NULL;
@@ -196,9 +171,9 @@ char *get_name(void) {
 }
 
 bool setup_myself_reloadable(void) {
-	localdiscovery = true;
+	mesh->localdiscovery = true;
 	keylifetime = 3600; // TODO: check if this can be removed as well
-	maxtimeout = 900;
+	mesh->maxtimeout = 900;
 	autoconnect = 3;
 	mesh->self->options |= OPTION_PMTU_DISCOVERY;
 
@@ -211,7 +186,7 @@ bool setup_myself_reloadable(void) {
   Add listening sockets.
 */
 static bool add_listen_address(char *address, bool bindto) {
-	char *port = myport;
+	char *port = mesh->myport;
 
 	if(address) {
 		char *space = strchr(address, ' ');
@@ -242,8 +217,8 @@ static bool add_listen_address(char *address, bool bindto) {
 		// Ignore duplicate addresses
 		bool found = false;
 
-		for(int i = 0; i < listen_sockets; i++)
-			if(!memcmp(&listen_socket[i].sa, aip->ai_addr, aip->ai_addrlen)) {
+		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;
 			}
@@ -251,7 +226,7 @@ static bool add_listen_address(char *address, bool bindto) {
 		if(found)
 			continue;
 
-		if(listen_sockets >= MAXSOCKETS) {
+		if(mesh->listen_sockets >= MAXSOCKETS) {
 			logger(DEBUG_ALWAYS, LOG_ERR, "Too many listening sockets");
 			return false;
 		}
@@ -268,18 +243,18 @@ static bool add_listen_address(char *address, bool bindto) {
 			continue;
 		}
 
-		io_add(&listen_socket[listen_sockets].tcp, handle_new_meta_connection, &listen_socket[listen_sockets], tcp_fd, IO_READ);
-		io_add(&listen_socket[listen_sockets].udp, handle_incoming_vpn_data, &listen_socket[listen_sockets], udp_fd, IO_READ);
+		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(debug_level >= DEBUG_CONNECTIONS) {
+		if(mesh->debug_level >= DEBUG_CONNECTIONS) {
 			char *hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
 			logger(DEBUG_CONNECTIONS, LOG_NOTICE, "Listening on %s", hostname);
 			free(hostname);
 		}
 
-		listen_socket[listen_sockets].bindto = bindto;
-		memcpy(&listen_socket[listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
-		listen_sockets++;
+		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++;
 	}
 
 	freeaddrinfo(ai);
@@ -303,10 +278,10 @@ bool setup_myself(void) {
 	mesh->self->connection = new_connection();
 	mesh->self->name = name;
 	mesh->self->connection->name = xstrdup(name);
-	read_host_config(config_tree, name);
+	read_host_config(mesh->config, name);
 
-	if(!get_config_string(lookup_config(config_tree, "Port"), &myport))
-		myport = xstrdup("655");
+	if(!get_config_string(lookup_config(mesh->config, "Port"), &mesh->myport))
+		mesh->myport = xstrdup("655");
 	else
 		port_specified = true;
 
@@ -319,16 +294,16 @@ bool setup_myself(void) {
 	if(!read_ecdsa_private_key())
 		return false;
 
-	/* Ensure myport is numeric */
+	/* Ensure mesh->myport is numeric */
 
-	if(!atoi(myport)) {
-		struct addrinfo *ai = str2addrinfo("localhost", myport, SOCK_DGRAM);
+	if(!atoi(mesh->myport)) {
+		struct addrinfo *ai = str2addrinfo("localhost", mesh->myport, SOCK_DGRAM);
 		sockaddr_t sa;
 		if(!ai || !ai->ai_addr)
 			return false;
-		free(myport);
+		free(mesh->myport);
 		memcpy(&sa, ai->ai_addr, ai->ai_addrlen);
-		sockaddr2str(&sa, NULL, &myport);
+		sockaddr2str(&sa, NULL, &mesh->myport);
 	}
 
 	/* Check some options */
@@ -336,9 +311,6 @@ bool setup_myself(void) {
 	if(!setup_myself_reloadable())
 		return false;
 
-	// TODO: check whether this is used at all
-	timeout_add(&keyexpire_timeout, keyexpire_handler, &keyexpire_timeout, &(struct timeval){keylifetime, rand() % 100000});
-
 	/* Compression */
 
 	// TODO: drop compression in the packet layer?
@@ -360,28 +332,28 @@ bool setup_myself(void) {
 
 	/* Open sockets */
 
-	listen_sockets = 0;
+	mesh->listen_sockets = 0;
 	int cfgs = 0;
 
 	if(!add_listen_address(address, NULL))
 		return false;
 
-	if(!listen_sockets) {
+	if(!mesh->listen_sockets) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Unable to create any listening socket!");
 		return false;
 	}
 
 	// TODO: require Port to be set? Or use "0" and use getsockname()?
 
-	if(!myport)
-		myport = xstrdup("655");
+	if(!mesh->myport)
+		mesh->myport = xstrdup("655");
 
-	xasprintf(&mesh->self->hostname, "MYSELF port %s", myport);
+	xasprintf(&mesh->self->hostname, "MYSELF port %s", mesh->myport);
 	mesh->self->connection->hostname = xstrdup(mesh->self->hostname);
 
 	/* Done. */
 
-	last_config_check = now.tv_sec;
+	mesh->last_config_check = now.tv_sec;
 
 	return true;
 }
@@ -395,8 +367,8 @@ bool setup_network(void) {
 	init_edges();
 	init_requests();
 
-	pinginterval = 60;
-	pingtimeout = 5;
+	mesh->pinginterval = 60;
+	mesh->pingtimeout = 5;
 	maxoutbufsize = 10 * MTU;
 
 	if(!setup_myself())
@@ -409,26 +381,26 @@ bool setup_network(void) {
   close all open network connections
 */
 void close_network_connections(void) {
-	for(list_node_t *node = connection_list->head, *next; node; node = next) {
+	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);
 	}
 
-	if(outgoing_list)
-		list_delete_list(outgoing_list);
+	if(mesh->outgoings)
+		list_delete_list(mesh->outgoings);
 
 	if(mesh->self && mesh->self->connection) {
 		terminate_connection(mesh->self->connection, false);
 		free_connection(mesh->self->connection);
 	}
 
-	for(int i = 0; i < listen_sockets; i++) {
-		io_del(&listen_socket[i].tcp);
-		io_del(&listen_socket[i].udp);
-		close(listen_socket[i].tcp.fd);
-		close(listen_socket[i].udp.fd);
+	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);
 	}
 
 	exit_requests();
@@ -436,7 +408,7 @@ void close_network_connections(void) {
 	exit_nodes();
 	exit_connections();
 
-	if(myport) free(myport);
+	if(mesh->myport) free(mesh->myport);
 
 	return;
 }