X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_setup.c;h=9c188957afa449c5fca8849f69d0884893cae642;hb=a22041922f160667573e9a5ae3f4195e1668906a;hp=813c58baca29fbf782a88d2133d9f01e00d72e4d;hpb=f75e71bc693847af71f61fb72cd788e3e47f9bd3;p=tinc

diff --git a/src/net_setup.c b/src/net_setup.c
index 813c58ba..9c188957 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -21,17 +21,13 @@
 
 #include "system.h"
 
-#include <openssl/pem.h>
-#include <openssl/rsa.h>
-#include <openssl/rand.h>
-#include <openssl/err.h>
-#include <openssl/evp.h>
-
-#include "avl_tree.h"
+#include "splay_tree.h"
+#include "cipher.h"
 #include "conf.h"
 #include "connection.h"
+#include "control.h"
 #include "device.h"
-#include "event.h"
+#include "digest.h"
 #include "graph.h"
 #include "logger.h"
 #include "net.h"
@@ -39,130 +35,73 @@
 #include "process.h"
 #include "protocol.h"
 #include "route.h"
+#include "rsa.h"
 #include "subnet.h"
 #include "utils.h"
 #include "xalloc.h"
 
 char *myport;
+static struct event device_ev;
 
 bool read_rsa_public_key(connection_t *c) {
 	FILE *fp;
 	char *fname;
-	char *key;
-
-	if(!c->rsa_key) {
-		c->rsa_key = RSA_new();
-//		RSA_blinding_on(c->rsa_key, NULL);
-	}
+	char *n;
+	bool result;
 
 	/* First, check for simple PublicKey statement */
 
-	if(get_config_string(lookup_config(c->config_tree, "PublicKey"), &key)) {
-		BN_hex2bn(&c->rsa_key->n, key);
-		BN_hex2bn(&c->rsa_key->e, "FFFF");
-		free(key);
-		return true;
+	if(get_config_string(lookup_config(c->config_tree, "PublicKey"), &n)) {
+		result = rsa_set_hex_public_key(&c->rsa, n, "FFFF");
+		free(n);
+		return result;
 	}
 
 	/* Else, check for PublicKeyFile statement and read it */
 
-	if(get_config_string(lookup_config(c->config_tree, "PublicKeyFile"), &fname)) {
-		fp = fopen(fname, "r");
-
-		if(!fp) {
-			logger(LOG_ERR, "Error reading RSA public key file `%s': %s",
-				   fname, strerror(errno));
-			free(fname);
-			return false;
-		}
-
-		free(fname);
-		c->rsa_key = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL);
-		fclose(fp);
-
-		if(c->rsa_key)
-			return true;		/* Woohoo. */
+	if(!get_config_string(lookup_config(c->config_tree, "PublicKeyFile"), &fname))
+		xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
 
-		/* If it fails, try PEM_read_RSA_PUBKEY. */
-		fp = fopen(fname, "r");
-
-		if(!fp) {
-			logger(LOG_ERR, "Error reading RSA public key file `%s': %s",
-				   fname, strerror(errno));
-			free(fname);
-			return false;
-		}
-
-		free(fname);
-		c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL);
-		fclose(fp);
-
-		if(c->rsa_key) {
-//				RSA_blinding_on(c->rsa_key, NULL);
-			return true;
-		}
+	fp = fopen(fname, "r");
 
-		logger(LOG_ERR, "Reading RSA public key file `%s' failed: %s",
+	if(!fp) {
+		logger(LOG_ERR, "Error reading RSA public key file `%s': %s",
 			   fname, strerror(errno));
+		free(fname);
 		return false;
 	}
 
-	/* Else, check if a harnessed public key is in the config file */
-
-	xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
-	fp = fopen(fname, "r");
-
-	if(fp) {
-		c->rsa_key = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL);
-		fclose(fp);
-	}
-
-	free(fname);
-
-	if(c->rsa_key)
-		return true;
-
-	/* Try again with PEM_read_RSA_PUBKEY. */
-
-	xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
-	fp = fopen(fname, "r");
-
-	if(fp) {
-		c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL);
-//		RSA_blinding_on(c->rsa_key, NULL);
-		fclose(fp);
-	}
+	result = rsa_read_pem_public_key(&c->rsa, fp);
+	fclose(fp);
 
+	if(!result) 
+		logger(LOG_ERR, "Reading RSA public key file `%s' failed: %s", fname, strerror(errno));
 	free(fname);
-
-	if(c->rsa_key)
-		return true;
-
-	logger(LOG_ERR, "No public key for %s specified!", c->name);
-
-	return false;
+	return result;
 }
 
-bool read_rsa_private_key(void) {
+bool read_rsa_private_key() {
 	FILE *fp;
-	char *fname, *key, *pubkey;
-	struct stat s;
+	char *fname;
+	char *n, *d;
+	bool result;
 
-	if(get_config_string(lookup_config(config_tree, "PrivateKey"), &key)) {
-		if(!get_config_string(lookup_config(myself->connection->config_tree, "PublicKey"), &pubkey)) {
+	/* First, check for simple PrivateKey statement */
+
+	if(get_config_string(lookup_config(config_tree, "PrivateKey"), &d)) {
+		if(!get_config_string(lookup_config(config_tree, "PublicKey"), &n)) {
 			logger(LOG_ERR, "PrivateKey used but no PublicKey found!");
+			free(d);
 			return false;
 		}
-		myself->connection->rsa_key = RSA_new();
-//		RSA_blinding_on(myself->connection->rsa_key, NULL);
-		BN_hex2bn(&myself->connection->rsa_key->d, key);
-		BN_hex2bn(&myself->connection->rsa_key->n, pubkey);
-		BN_hex2bn(&myself->connection->rsa_key->e, "FFFF");
-		free(key);
-		free(pubkey);
+		result = rsa_set_hex_private_key(&myself->connection->rsa, n, "FFFF", d);
+		free(n);
+		free(d);
 		return true;
 	}
 
+	/* Else, check for PrivateKeyFile statement and read it */
+
 	if(!get_config_string(lookup_config(config_tree, "PrivateKeyFile"), &fname))
 		xasprintf(&fname, "%s/rsa_key.priv", confbase);
 
@@ -176,9 +115,10 @@ bool read_rsa_private_key(void) {
 	}
 
 #if !defined(HAVE_MINGW) && !defined(HAVE_CYGWIN)
+	struct stat s;
+
 	if(fstat(fileno(fp), &s)) {
-		logger(LOG_ERR, "Could not stat RSA private key file `%s': %s'",
-				fname, strerror(errno));
+		logger(LOG_ERR, "Could not stat RSA private key file `%s': %s'", fname, strerror(errno));
 		free(fname);
 		return false;
 	}
@@ -187,31 +127,44 @@ bool read_rsa_private_key(void) {
 		logger(LOG_WARNING, "Warning: insecure file permissions for RSA private key file `%s'!", fname);
 #endif
 
-	myself->connection->rsa_key = PEM_read_RSAPrivateKey(fp, NULL, NULL, NULL);
+	result = rsa_read_pem_private_key(&myself->connection->rsa, fp);
 	fclose(fp);
 
-	if(!myself->connection->rsa_key) {
-		logger(LOG_ERR, "Reading RSA private key file `%s' failed: %s",
-			   fname, strerror(errno));
-		free(fname);
-		return false;
+	if(!result) 
+		logger(LOG_ERR, "Reading RSA private key file `%s' failed: %s", fname, strerror(errno));
+	free(fname);
+	return result;
+}
+
+static struct event keyexpire_event;
+
+static void keyexpire_handler(int fd, short events, void *data) {
+	regenerate_key();
+}
+
+void regenerate_key() {
+	if(timeout_initialized(&keyexpire_event)) {
+		ifdebug(STATUS) logger(LOG_INFO, "Expiring symmetric keys");
+		event_del(&keyexpire_event);
+		send_key_changed(broadcast, myself);
+	} else {
+		timeout_set(&keyexpire_event, keyexpire_handler, NULL);
 	}
 
-	free(fname);
-	return true;
+	event_add(&keyexpire_event, &(struct timeval){keylifetime, 0});
 }
 
 /*
   Read Subnets from all host config files
 */
-static void load_all_subnets(void) {
+void load_all_subnets(void) {
 	DIR *dir;
 	struct dirent *ent;
 	char *dname;
 	char *fname;
-	avl_tree_t *config_tree;
+	splay_tree_t *config_tree;
 	config_t *cfg;
-	subnet_t *s;
+	subnet_t *s, *s2;
 	node_t *n;
 	bool result;
 
@@ -228,9 +181,6 @@ static void load_all_subnets(void) {
 			continue;
 
 		n = lookup_node(ent->d_name);
-		if(n)
-			continue;
-
 		#ifdef _DIRENT_HAVE_D_TYPE
 		//if(ent->d_type != DT_REG)
 		//	continue;
@@ -243,15 +193,21 @@ static void load_all_subnets(void) {
 		if(!result)
 			continue;
 
-		n = new_node();
-		n->name = xstrdup(ent->d_name);
-		node_add(n);
+		if(!n) {
+			n = new_node();
+			n->name = xstrdup(ent->d_name);
+			node_add(n);
+		}
 
 		for(cfg = lookup_config(config_tree, "Subnet"); cfg; cfg = lookup_config_next(config_tree, cfg)) {
 			if(!get_config_subnet(cfg, &s))
 				continue;
 
-			subnet_add(n, s);
+			if((s2 = lookup_subnet(n, s))) {
+				s2->expires = -1;
+			} else {
+				subnet_add(n, s);
+			}
 		}
 
 		exit_configuration(&config_tree);
@@ -267,6 +223,7 @@ bool setup_myself(void) {
 	config_t *cfg;
 	subnet_t *subnet;
 	char *name, *hostname, *mode, *afname, *cipher, *digest;
+	char *fname = NULL;
 	char *address = NULL;
 	char *envp[5];
 	struct addrinfo *ai, *aip, hint = {0};
@@ -275,7 +232,6 @@ bool setup_myself(void) {
 
 	myself = new_node();
 	myself->connection = new_connection();
-	init_configuration(&myself->connection->config_tree);
 
 	myself->hostname = xstrdup("MYSELF");
 	myself->connection->hostname = xstrdup("MYSELF");
@@ -296,17 +252,15 @@ bool setup_myself(void) {
 
 	myself->name = name;
 	myself->connection->name = xstrdup(name);
-
-	if(!read_connection_config(myself->connection)) {
-		logger(LOG_ERR, "Cannot open host configuration file for myself!");
-		return false;
-	}
+	xasprintf(&fname, "%s/hosts/%s", confbase, name);
+	read_config_options(config_tree, name);
+	read_config_file(config_tree, fname);
+	free(fname);
 
 	if(!read_rsa_private_key())
 		return false;
 
-	if(!get_config_string(lookup_config(config_tree, "Port"), &myport)
-			&& !get_config_string(lookup_config(myself->connection->config_tree, "Port"), &myport))
+	if(!get_config_string(lookup_config(config_tree, "Port"), &myport))
 		myport = xstrdup("655");
 
 	if(!atoi(myport)) {
@@ -321,7 +275,7 @@ bool setup_myself(void) {
 
 	/* Read in all the subnets specified in the host configuration file */
 
-	cfg = lookup_config(myself->connection->config_tree, "Subnet");
+	cfg = lookup_config(config_tree, "Subnet");
 
 	while(cfg) {
 		if(!get_config_subnet(cfg, &subnet))
@@ -329,7 +283,7 @@ bool setup_myself(void) {
 
 		subnet_add(myself, subnet);
 
-		cfg = lookup_config_next(myself->connection->config_tree, cfg);
+		cfg = lookup_config_next(config_tree, cfg);
 	}
 
 	/* Check some options */
@@ -340,12 +294,6 @@ bool setup_myself(void) {
 	if(get_config_bool(lookup_config(config_tree, "TCPOnly"), &choice) && choice)
 		myself->options |= OPTION_TCPONLY;
 
-	if(get_config_bool(lookup_config(myself->connection->config_tree, "IndirectData"), &choice) && choice)
-		myself->options |= OPTION_INDIRECT;
-
-	if(get_config_bool(lookup_config(myself->connection->config_tree, "TCPOnly"), &choice) && choice)
-		myself->options |= OPTION_TCPONLY;
-
 	if(myself->options & OPTION_TCPONLY)
 		myself->options |= OPTION_INDIRECT;
 
@@ -383,14 +331,12 @@ bool setup_myself(void) {
 	}
 
 	choice = true;
-	get_config_bool(lookup_config(myself->connection->config_tree, "PMTUDiscovery"), &choice);
 	get_config_bool(lookup_config(config_tree, "PMTUDiscovery"), &choice);
 	if(choice)
 		myself->options |= OPTION_PMTU_DISCOVERY;
 
 	choice = true;
 	get_config_bool(lookup_config(config_tree, "ClampMSS"), &choice);
-	get_config_bool(lookup_config(myself->connection->config_tree, "ClampMSS"), &choice);
 	if(choice)
 		myself->options |= OPTION_CLAMP_MSS;
 
@@ -430,69 +376,40 @@ bool setup_myself(void) {
 
 	/* Generate packet encryption key */
 
-	if(get_config_string
-	   (lookup_config(myself->connection->config_tree, "Cipher"), &cipher)) {
-		if(!strcasecmp(cipher, "none")) {
-			myself->incipher = NULL;
-		} else {
-			myself->incipher = EVP_get_cipherbyname(cipher);
-
-			if(!myself->incipher) {
-				logger(LOG_ERR, "Unrecognized cipher type!");
-				return false;
-			}
-		}
-	} else
-		myself->incipher = EVP_bf_cbc();
+	if(!get_config_string(lookup_config(config_tree, "Cipher"), &cipher))
+		cipher = xstrdup("blowfish");
 
-	if(myself->incipher)
-		myself->inkeylength = myself->incipher->key_len + myself->incipher->iv_len;
-	else
-		myself->inkeylength = 1;
-
-	myself->connection->outcipher = EVP_bf_ofb();
+	if(!cipher_open_by_name(&myself->incipher, cipher)) {
+		logger(LOG_ERR, "Unrecognized cipher type!");
+		return false;
+	}
 
 	if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
 		keylifetime = 3600;
 
-	keyexpires = now + keylifetime;
-	
+	regenerate_key();
+
 	/* Check if we want to use message authentication codes... */
 
-	if(get_config_string(lookup_config(myself->connection->config_tree, "Digest"), &digest)) {
-		if(!strcasecmp(digest, "none")) {
-			myself->indigest = NULL;
-		} else {
-			myself->indigest = EVP_get_digestbyname(digest);
+	if(!get_config_string(lookup_config(myself->connection->config_tree, "Digest"), &digest))
+		digest = xstrdup("sha1");
 
-			if(!myself->indigest) {
-				logger(LOG_ERR, "Unrecognized digest type!");
-				return false;
-			}
-		}
-	} else
-		myself->indigest = EVP_sha1();
-
-	myself->connection->outdigest = EVP_sha1();
-
-	if(get_config_int(lookup_config(myself->connection->config_tree, "MACLength"), &myself->inmaclength)) {
-		if(myself->indigest) {
-			if(myself->inmaclength > myself->indigest->md_size) {
-				logger(LOG_ERR, "MAC length exceeds size of digest!");
-				return false;
-			} else if(myself->inmaclength < 0) {
-				logger(LOG_ERR, "Bogus MAC length!");
-				return false;
-			}
-		}
-	} else
-		myself->inmaclength = 4;
+	int maclength = 4;
+	get_config_int(lookup_config(config_tree, "MACLength"), &maclength);
 
-	myself->connection->outmaclength = 0;
+	if(maclength < 0) {
+		logger(LOG_ERR, "Bogus MAC length!");
+		return false;
+	}
+
+	if(!digest_open_by_name(&myself->indigest, digest, maclength)) {
+		logger(LOG_ERR, "Unrecognized digest type!");
+		return false;
+	}
 
 	/* Compression */
 
-	if(get_config_int(lookup_config(myself->connection->config_tree, "Compression"), &myself->incompression)) {
+	if(get_config_int(lookup_config(config_tree, "Compression"), &myself->incompression)) {
 		if(myself->incompression < 0 || myself->incompression > 11) {
 			logger(LOG_ERR, "Bogus compression level!");
 			return false;
@@ -519,6 +436,16 @@ bool setup_myself(void) {
 	if(!setup_device())
 		return false;
 
+	if(device_fd >= 0) {
+		event_set(&device_ev, device_fd, EV_READ|EV_PERSIST, handle_device_data, NULL);
+
+		if (event_add(&device_ev, NULL) < 0) {
+			logger(LOG_ERR, "event_add failed: %s", strerror(errno));
+			close_device();
+			return false;
+		}
+	}
+
 	/* Run tinc-up script to further initialize the tap interface */
 	xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
 	xasprintf(&envp[1], "DEVICE=%s", device ? : "");
@@ -528,7 +455,7 @@ bool setup_myself(void) {
 
 	execute_script("tinc-up", envp);
 
-	for(i = 0; i < 5; i++)
+	for(i = 0; i < 4; i++)
 		free(envp[i]);
 
 	/* Run subnet-up scripts for our own subnets */
@@ -564,8 +491,28 @@ bool setup_myself(void) {
 		listen_socket[listen_sockets].udp =
 			setup_vpn_in_socket((sockaddr_t *) aip->ai_addr);
 
-		if(listen_socket[listen_sockets].udp < 0)
+		if(listen_socket[listen_sockets].udp < 0) {
+			close(listen_socket[listen_sockets].tcp);
 			continue;
+		}
+
+		event_set(&listen_socket[listen_sockets].ev_tcp,
+				  listen_socket[listen_sockets].tcp,
+				  EV_READ|EV_PERSIST,
+				  handle_new_meta_connection, NULL);
+		if(event_add(&listen_socket[listen_sockets].ev_tcp, NULL) < 0) {
+			logger(LOG_ERR, "event_add failed: %s", strerror(errno));
+			abort();
+		}
+
+		event_set(&listen_socket[listen_sockets].ev_udp,
+				  listen_socket[listen_sockets].udp,
+				  EV_READ|EV_PERSIST,
+				  handle_incoming_vpn_data, NULL);
+		if(event_add(&listen_socket[listen_sockets].ev_udp, NULL) < 0) {
+			logger(LOG_ERR, "event_add failed: %s", strerror(errno));
+			abort();
+		}
 
 		ifdebug(CONNECTIONS) {
 			hostname = sockaddr2hostname((sockaddr_t *) aip->ai_addr);
@@ -575,6 +522,11 @@ bool setup_myself(void) {
 
 		memcpy(&listen_socket[listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
 		listen_sockets++;
+
+		if(listen_sockets >= MAXSOCKETS) {
+			logger(LOG_WARNING, "Maximum of %d listening sockets reached", MAXSOCKETS);
+			break;
+		}
 	}
 
 	freeaddrinfo(ai);
@@ -593,9 +545,6 @@ bool setup_myself(void) {
   initialize network
 */
 bool setup_network(void) {
-	now = time(NULL);
-
-	init_events();
 	init_connections();
 	init_subnets();
 	init_nodes();
@@ -627,7 +576,7 @@ bool setup_network(void) {
   close all open network connections
 */
 void close_network_connections(void) {
-	avl_node_t *node, *next;
+	splay_node_t *node, *next;
 	connection_t *c;
 	char *envp[5];
 	int i;
@@ -635,17 +584,10 @@ void close_network_connections(void) {
 	for(node = connection_tree->head; node; node = next) {
 		next = node->next;
 		c = node->data;
-		c->outgoing = NULL;
+		c->outgoing = false;
 		terminate_connection(c, false);
 	}
 
-	for(list_node_t *node = outgoing_list->head; node; node = node->next) {
-		outgoing_t *outgoing = node->data;
-
-		if(outgoing->event)
-			event_del(outgoing->event);
-	}
-
 	list_delete_list(outgoing_list);
 
 	if(myself && myself->connection) {
@@ -655,6 +597,8 @@ void close_network_connections(void) {
 	}
 
 	for(i = 0; i < listen_sockets; i++) {
+		event_del(&listen_socket[i].ev_tcp);
+		event_del(&listen_socket[i].ev_udp);
 		close(listen_socket[i].tcp);
 		close(listen_socket[i].udp);
 	}
@@ -670,7 +614,6 @@ void close_network_connections(void) {
 	exit_subnets();
 	exit_nodes();
 	exit_connections();
-	exit_events();
 
 	execute_script("tinc-down", envp);