X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fprotocol_auth.c;h=be4d2ea084688525e34134ec5204343c56fbfe16;hb=a1b50920b9a52f86ca6e33fcb24d7fa34313a1ee;hp=1623e75e4992307f0b460e78f66a8f870301c689;hpb=5dec1c25713a19c49fcbb885200184a9682ef175;p=meshlink

diff --git a/src/protocol_auth.c b/src/protocol_auth.c
index 1623e75e..be4d2ea0 100644
--- a/src/protocol_auth.c
+++ b/src/protocol_auth.c
@@ -1,7 +1,6 @@
 /*
     protocol_auth.c -- handle the meta-protocol, authentication
-    Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2014 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
@@ -22,37 +21,30 @@
 
 #include "conf.h"
 #include "connection.h"
-#include "control.h"
-#include "control_common.h"
-#include "cipher.h"
-#include "crypto.h"
-#include "digest.h"
 #include "ecdsa.h"
 #include "edge.h"
 #include "graph.h"
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "meta.h"
-#include "names.h"
 #include "net.h"
 #include "netutl.h"
 #include "node.h"
 #include "prf.h"
 #include "protocol.h"
-#include "rsa.h"
 #include "sptps.h"
 #include "utils.h"
 #include "xalloc.h"
+#include "ed25519/sha512.h"
 
-ecdsa_t *invitation_key = NULL;
-
-static bool send_proxyrequest(connection_t *c) {
-	switch(proxytype) {
+static bool send_proxyrequest(meshlink_handle_t *mesh, connection_t *c) {
+	switch(mesh->proxytype) {
 		case PROXY_HTTP: {
 			char *host;
 			char *port;
 
 			sockaddr2str(&c->address, &host, &port);
-			send_request(c, "CONNECT %s:%s HTTP/1.1\r\n\r", host, port);
+			send_request(mesh, c, "CONNECT %s:%s HTTP/1.1\r\n\r", host, port);
 			free(host);
 			free(port);
 			return true;
@@ -62,35 +54,35 @@ static bool send_proxyrequest(connection_t *c) {
 				logger(DEBUG_ALWAYS, LOG_ERR, "Cannot connect to an IPv6 host through a SOCKS 4 proxy!");
 				return false;
 			}
-			char s4req[9 + (proxyuser ? strlen(proxyuser) : 0)];
+			char s4req[9 + (mesh->proxyuser ? strlen(mesh->proxyuser) : 0)];
 			s4req[0] = 4;
 			s4req[1] = 1;
 			memcpy(s4req + 2, &c->address.in.sin_port, 2);
 			memcpy(s4req + 4, &c->address.in.sin_addr, 4);
-			if(proxyuser)
-				memcpy(s4req + 8, proxyuser, strlen(proxyuser));
+			if(mesh->proxyuser)
+				memcpy(s4req + 8, mesh->proxyuser, strlen(mesh->proxyuser));
 			s4req[sizeof s4req - 1] = 0;
 			c->tcplen = 8;
-			return send_meta(c, s4req, sizeof s4req);
+			return send_meta(mesh, c, s4req, sizeof s4req);
 		}
 		case PROXY_SOCKS5: {
 			int len = 3 + 6 + (c->address.sa.sa_family == AF_INET ? 4 : 16);
 			c->tcplen = 2;
-			if(proxypass)
-				len += 3 + strlen(proxyuser) + strlen(proxypass);
+			if(mesh->proxypass)
+				len += 3 + strlen(mesh->proxyuser) + strlen(mesh->proxypass);
 			char s5req[len];
 			int i = 0;
 			s5req[i++] = 5;
 			s5req[i++] = 1;
-			if(proxypass) {
+			if(mesh->proxypass) {
 				s5req[i++] = 2;
 				s5req[i++] = 1;
-				s5req[i++] = strlen(proxyuser);
-				memcpy(s5req + i, proxyuser, strlen(proxyuser));
-				i += strlen(proxyuser);
-				s5req[i++] = strlen(proxypass);
-				memcpy(s5req + i, proxypass, strlen(proxypass));
-				i += strlen(proxypass);
+				s5req[i++] = strlen(mesh->proxyuser);
+				memcpy(s5req + i, mesh->proxyuser, strlen(mesh->proxyuser));
+				i += strlen(mesh->proxyuser);
+				s5req[i++] = strlen(mesh->proxypass);
+				memcpy(s5req + i, mesh->proxypass, strlen(mesh->proxypass));
+				i += strlen(mesh->proxypass);
 				c->tcplen += 2;
 			} else {
 				s5req[i++] = 0;
@@ -118,7 +110,7 @@ static bool send_proxyrequest(connection_t *c) {
 			}
 			if(i > len)
 				abort();
-			return send_meta(c, s5req, sizeof s5req);
+			return send_meta(mesh, c, s5req, sizeof s5req);
 		}
 		case PROXY_SOCKS4A:
 			logger(DEBUG_ALWAYS, LOG_ERR, "Proxy type not implemented yet");
@@ -131,26 +123,19 @@ static bool send_proxyrequest(connection_t *c) {
 	}
 }
 
-bool send_id(connection_t *c) {
+bool send_id(meshlink_handle_t *mesh, connection_t *c) {
 	gettimeofday(&c->start, NULL);
 
-	int minor = 0;
+	int minor = mesh->self->connection->protocol_minor;
 
-	if(experimental) {
-		if(c->outgoing && !read_ecdsa_public_key(c))
-			minor = 1;
-		else
-			minor = myself->connection->protocol_minor;
-	}
-
-	if(proxytype && c->outgoing)
-		if(!send_proxyrequest(c))
+	if(mesh->proxytype && c->outgoing)
+		if(!send_proxyrequest(mesh, c))
 			return false;
 
-	return send_request(c, "%d %s %d.%d", ID, myself->connection->name, myself->connection->protocol_major, minor);
+	return send_request(mesh, c, "%d %s %d.%d", ID, mesh->self->connection->name, mesh->self->connection->protocol_major, minor);
 }
 
-static bool finalize_invitation(connection_t *c, const char *data, uint16_t len) {
+static bool finalize_invitation(meshlink_handle_t *mesh, connection_t *c, const char *data, uint16_t len) {
 	if(strchr(data, '\n')) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Received invalid key from invited node %s (%s)!\n", c->name, c->hostname);
 		return false;
@@ -158,7 +143,7 @@ static bool finalize_invitation(connection_t *c, const char *data, uint16_t len)
 
 	// Create a new host config file
 	char filename[PATH_MAX];
-	snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", confbase, c->name);
+	snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, c->name);
 	if(!access(filename, F_OK)) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Host config file for %s (%s) already exists!\n", c->name, c->hostname);
 		return false;
@@ -174,28 +159,40 @@ static bool finalize_invitation(connection_t *c, const char *data, uint16_t len)
 	fclose(f);
 
 	logger(DEBUG_CONNECTIONS, LOG_INFO, "Key succesfully received from %s (%s)", c->name, c->hostname);
+
+	//TODO: callback to application to inform of an accepted invitation
+
 	sptps_send_record(&c->sptps, 2, data, 0);
 	return true;
 }
 
 static bool receive_invitation_sptps(void *handle, uint8_t type, const char *data, uint16_t len) {
 	connection_t *c = handle;
+	meshlink_handle_t *mesh = c->mesh;
 
 	if(type == 128)
 		return true;
 
 	if(type == 1 && c->status.invitation_used)
-		return finalize_invitation(c, data, len);
+		return finalize_invitation(mesh, c, data, len);
 
 	if(type != 0 || len != 18 || c->status.invitation_used)
 		return false;
 
+	// Recover the filename from the cookie and the key
+	char *fingerprint = ecdsa_get_base64_public_key(mesh->invitation_key);
+	char hash[64];
+	char hashbuf[18 + strlen(fingerprint)];
 	char cookie[25];
-	b64encode_urlsafe(data, cookie, 18);
+	memcpy(hashbuf, data, 18);
+	memcpy(hashbuf + 18, fingerprint, sizeof hashbuf - 18);
+	sha512(hashbuf, sizeof hashbuf, hash);
+	b64encode_urlsafe(hash, cookie, 18);
+	free(fingerprint);
 
 	char filename[PATH_MAX], usedname[PATH_MAX];
-	snprintf(filename, sizeof filename, "%s" SLASH "invitations" SLASH "%s", confbase, cookie);
-	snprintf(usedname, sizeof usedname, "%s" SLASH "invitations" SLASH "%s.used", confbase, cookie);
+	snprintf(filename, sizeof filename, "%s" SLASH "invitations" SLASH "%s", mesh->confbase, cookie);
+	snprintf(usedname, sizeof usedname, "%s" SLASH "invitations" SLASH "%s.used", mesh->confbase, cookie);
 
 	// Atomically rename the invitation file
 	if(rename(filename, usedname)) {
@@ -252,7 +249,7 @@ static bool receive_invitation_sptps(void *handle, uint8_t type, const char *dat
 	return true;
 }
 
-bool id_h(connection_t *c, const char *request) {
+bool id_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	char name[MAX_STRING_SIZE];
 
 	if(sscanf(request, "%*d " MAX_STRING " %d.%d", name, &c->protocol_major, &c->protocol_minor) < 2) {
@@ -261,21 +258,10 @@ bool id_h(connection_t *c, const char *request) {
 		return false;
 	}
 
-	/* Check if this is a control connection */
-
-	if(name[0] == '^' && !strcmp(name + 1, controlcookie)) {
-		c->status.control = true;
-		c->allow_request = CONTROL;
-		c->last_ping_time = now.tv_sec + 3600;
-
-		free(c->name);
-		c->name = xstrdup("<control>");
-
-		return send_request(c, "%d %d %d", ACK, TINC_CTL_VERSION_CURRENT, getpid());
-	}
+	/* Check if this is an invitation  */
 
 	if(name[0] == '?') {
-		if(!invitation_key) {
+		if(!mesh->invitation_key) {
 			logger(DEBUG_ALWAYS, LOG_ERR, "Got invitation from %s but we don't have an invitation key", c->hostname);
 			return false;
 		}
@@ -287,16 +273,16 @@ bool id_h(connection_t *c, const char *request) {
 		}
 
 		c->status.invitation = true;
-		char *mykey = ecdsa_get_base64_public_key(invitation_key);
+		char *mykey = ecdsa_get_base64_public_key(mesh->invitation_key);
 		if(!mykey)
 			return false;
-		if(!send_request(c, "%d %s", ACK, mykey))
+		if(!send_request(mesh, c, "%d %s", ACK, mykey))
 			return false;
 		free(mykey);
 
 		c->protocol_minor = 2;
 
-		return sptps_start(&c->sptps, c, false, false, invitation_key, c->ecdsa, "tinc invitation", 15, send_meta_sptps, receive_invitation_sptps);
+		return sptps_start(&c->sptps, c, false, false, mesh->invitation_key, c->ecdsa, "tinc invitation", 15, send_meta_sptps, receive_invitation_sptps);
 	}
 
 	/* Check if identity is a valid name */
@@ -323,32 +309,21 @@ bool id_h(connection_t *c, const char *request) {
 
 	/* Check if version matches */
 
-	if(c->protocol_major != myself->connection->protocol_major) {
+	if(c->protocol_major != mesh->self->connection->protocol_major) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s (%s) uses incompatible version %d.%d",
 			c->name, c->hostname, c->protocol_major, c->protocol_minor);
 		return false;
 	}
 
-	if(bypass_security) {
-		if(!c->config_tree)
-			init_configuration(&c->config_tree);
-		c->allow_request = ACK;
-		return send_ack(c);
-	}
-
-	if(!experimental)
-		c->protocol_minor = 0;
-
 	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)) {
 			logger(DEBUG_ALWAYS, LOG_ERR, "Peer %s had unknown identity (%s)", c->hostname, c->name);
 			return false;
 		}
 
-		if(experimental)
-			read_ecdsa_public_key(c);
+		read_ecdsa_public_key(mesh, c);
 	} else {
 		if(c->protocol_minor && !ecdsa_active(c->ecdsa))
 			c->protocol_minor = 1;
@@ -362,258 +337,18 @@ bool id_h(connection_t *c, const char *request) {
 		return false;
 	}
 
-	c->allow_request = METAKEY;
-
-	if(c->protocol_minor >= 2) {
-		c->allow_request = ACK;
-		char label[25 + strlen(myself->name) + strlen(c->name)];
-
-		if(c->outgoing)
-			snprintf(label, sizeof label, "tinc TCP key expansion %s %s", myself->name, c->name);
-		else
-			snprintf(label, sizeof label, "tinc TCP key expansion %s %s", c->name, myself->name);
-
-		return sptps_start(&c->sptps, c, c->outgoing, false, myself->connection->ecdsa, c->ecdsa, label, sizeof label, send_meta_sptps, receive_meta_sptps);
-	} else {
-		return send_metakey(c);
-	}
-}
-
-bool send_metakey(connection_t *c) {
-	if(!read_rsa_public_key(c))
-		return false;
-
-	if(!(c->outcipher = cipher_open_blowfish_ofb()))
-		return false;
-
-	if(!(c->outdigest = digest_open_sha1(-1)))
-		return false;
-
-	size_t len = rsa_size(c->rsa);
-	char key[len];
-	char enckey[len];
-	char hexkey[2 * len + 1];
-
-	/* Create a random key */
-
-	randomize(key, len);
-
-	/* The message we send must be smaller than the modulus of the RSA key.
-	   By definition, for a key of k bits, the following formula holds:
-
-	   2^(k-1) <= modulus < 2^(k)
-
-	   Where ^ means "to the power of", not "xor".
-	   This means that to be sure, we must choose our message < 2^(k-1).
-	   This can be done by setting the most significant bit to zero.
-	 */
-
-	key[0] &= 0x7F;
-
-	if(!cipher_set_key_from_rsa(c->outcipher, key, len, true))
-		return false;
-
-	if(debug_level >= DEBUG_SCARY_THINGS) {
-		bin2hex(key, hexkey, len);
-		logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Generated random meta key (unencrypted): %s", hexkey);
-	}
-
-	/* Encrypt the random data
-
-	   We do not use one of the PKCS padding schemes here.
-	   This is allowed, because we encrypt a totally random string
-	   with a length equal to that of the modulus of the RSA key.
-	 */
-
-	if(!rsa_public_encrypt(c->rsa, key, len, enckey)) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Error during encryption of meta key for %s (%s)", c->name, c->hostname);
-		return false;
-	}
-
-	/* Convert the encrypted random data to a hexadecimal formatted string */
-
-	bin2hex(enckey, hexkey, len);
-
-	/* Send the meta key */
-
-	bool result = send_request(c, "%d %d %d %d %d %s", METAKEY,
-			 cipher_get_nid(c->outcipher),
-			 digest_get_nid(c->outdigest), c->outmaclength,
-			 c->outcompression, hexkey);
-
-	c->status.encryptout = true;
-	return result;
-}
-
-bool metakey_h(connection_t *c, const char *request) {
-	char hexkey[MAX_STRING_SIZE];
-	int cipher, digest, maclength, compression;
-	size_t len = rsa_size(myself->connection->rsa);
-	char enckey[len];
-	char key[len];
-
-	if(sscanf(request, "%*d %d %d %d %d " MAX_STRING, &cipher, &digest, &maclength, &compression, hexkey) != 5) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "METAKEY", c->name, c->hostname);
-		return false;
-	}
-
-	/* Convert the challenge from hexadecimal back to binary */
-
-	int inlen = hex2bin(hexkey, enckey, sizeof enckey);
-
-	/* Check if the length of the meta key is all right */
-
-	if(inlen != len) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Possible intruder %s (%s): %s", c->name, c->hostname, "wrong keylength");
-		return false;
-	}
-
-	/* Decrypt the meta key */
-
-	if(!rsa_private_decrypt(myself->connection->rsa, enckey, len, key)) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Error during decryption of meta key for %s (%s)", c->name, c->hostname);
-		return false;
-	}
-
-	if(debug_level >= DEBUG_SCARY_THINGS) {
-		bin2hex(key, hexkey, len);
-		logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Received random meta key (unencrypted): %s", hexkey);
-	}
-
-	/* Check and lookup cipher and digest algorithms */
-
-	if(!(c->incipher = cipher_open_by_nid(cipher)) || !cipher_set_key_from_rsa(c->incipher, key, len, false)) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Error during initialisation of cipher from %s (%s)", c->name, c->hostname);
-		return false;
-	}
-
-	if(!(c->indigest = digest_open_by_nid(digest, -1))) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Error during initialisation of digest from %s (%s)", c->name, c->hostname);
-		return false;
-	}
-
-	c->status.decryptin = true;
-
-	c->allow_request = CHALLENGE;
-
-	return send_challenge(c);
-}
-
-bool send_challenge(connection_t *c) {
-	size_t len = rsa_size(c->rsa);
-	char buffer[len * 2 + 1];
-
-	if(!c->hischallenge)
-		c->hischallenge = xrealloc(c->hischallenge, len);
-
-	/* Copy random data to the buffer */
-
-	randomize(c->hischallenge, len);
-
-	/* Convert to hex */
-
-	bin2hex(c->hischallenge, buffer, len);
-
-	/* Send the challenge */
-
-	return send_request(c, "%d %s", CHALLENGE, buffer);
-}
-
-bool challenge_h(connection_t *c, const char *request) {
-	char buffer[MAX_STRING_SIZE];
-	size_t len = rsa_size(myself->connection->rsa);
-	size_t digestlen = digest_length(c->indigest);
-	char digest[digestlen];
-
-	if(sscanf(request, "%*d " MAX_STRING, buffer) != 1) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "CHALLENGE", c->name, c->hostname);
-		return false;
-	}
-
-	/* Convert the challenge from hexadecimal back to binary */
-
-	int inlen = hex2bin(buffer, buffer, sizeof buffer);
-
-	/* Check if the length of the challenge is all right */
-
-	if(inlen != len) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Possible intruder %s (%s): %s", c->name, c->hostname, "wrong challenge length");
-		return false;
-	}
-
-	/* Calculate the hash from the challenge we received */
-
-	if(!digest_create(c->indigest, buffer, len, digest))
-		return false;
-
-	/* Convert the hash to a hexadecimal formatted string */
-
-	bin2hex(digest, buffer, digestlen);
-
-	/* Send the reply */
-
-	c->allow_request = CHAL_REPLY;
-
-	return send_request(c, "%d %s", CHAL_REPLY, buffer);
-}
-
-bool chal_reply_h(connection_t *c, const char *request) {
-	char hishash[MAX_STRING_SIZE];
-
-	if(sscanf(request, "%*d " MAX_STRING, hishash) != 1) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "CHAL_REPLY", c->name,
-			   c->hostname);
-		return false;
-	}
-
-	/* Convert the hash to binary format */
-
-	int inlen = hex2bin(hishash, hishash, sizeof hishash);
-
-	/* Check if the length of the hash is all right */
-
-	if(inlen != digest_length(c->outdigest)) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Possible intruder %s (%s): %s", c->name, c->hostname, "wrong challenge reply length");
-		return false;
-	}
-
-
-	/* Verify the hash */
-
-	if(!digest_verify(c->outdigest, c->hischallenge, rsa_size(c->rsa), hishash)) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Possible intruder %s (%s): %s", c->name, c->hostname, "wrong challenge reply");
-		return false;
-	}
-
-	/* Identity has now been positively verified.
-	   Send an acknowledgement with the rest of the information needed.
-	 */
-
-	free(c->hischallenge);
-	c->hischallenge = NULL;
 	c->allow_request = ACK;
+	char label[25 + strlen(mesh->self->name) + strlen(c->name)];
 
-	return send_ack(c);
-}
-
-static bool send_upgrade(connection_t *c) {
-	/* Special case when protocol_minor is 1: the other end is ECDSA capable,
-	 * but doesn't know our key yet. So send it now. */
-
-	char *pubkey = ecdsa_get_base64_public_key(myself->connection->ecdsa);
-
-	if(!pubkey)
-		return false;
+	if(c->outgoing)
+		snprintf(label, sizeof label, "tinc TCP key expansion %s %s", mesh->self->name, c->name);
+	else
+		snprintf(label, sizeof label, "tinc TCP key expansion %s %s", c->name, mesh->self->name);
 
-	bool result = send_request(c, "%d %s", ACK, pubkey);
-	free(pubkey);
-	return result;
+	return sptps_start(&c->sptps, c, c->outgoing, false, mesh->self->connection->ecdsa, c->ecdsa, label, sizeof label, send_meta_sptps, receive_meta_sptps);
 }
 
-bool send_ack(connection_t *c) {
-	if(c->protocol_minor == 1)
-		return send_upgrade(c);
-
+bool send_ack(meshlink_handle_t *mesh, connection_t *c) {
 	/* ACK message contains rest of the information the other end needs
 	   to create node_t and edge_t structures. */
 
@@ -627,78 +362,22 @@ bool send_ack(connection_t *c) {
 
 	/* Check some options */
 
-	if((get_config_bool(lookup_config(c->config_tree, "IndirectData"), &choice) && choice) || myself->options & OPTION_INDIRECT)
-		c->options |= OPTION_INDIRECT;
-
-	if((get_config_bool(lookup_config(c->config_tree, "TCPOnly"), &choice) && choice) || myself->options & OPTION_TCPONLY)
-		c->options |= OPTION_TCPONLY | OPTION_INDIRECT;
-
-	if(myself->options & OPTION_PMTU_DISCOVERY)
+	if(mesh->self->options & OPTION_PMTU_DISCOVERY)
 		c->options |= OPTION_PMTU_DISCOVERY;
 
-	choice = myself->options & OPTION_CLAMP_MSS;
-	get_config_bool(lookup_config(c->config_tree, "ClampMSS"), &choice);
-	if(choice)
-		c->options |= OPTION_CLAMP_MSS;
-
-	get_config_int(lookup_config(c->config_tree, "Weight"), &c->estimated_weight);
-
-	return send_request(c, "%d %s %d %x", ACK, myport, c->estimated_weight, (c->options & 0xffffff) | (experimental ? (PROT_MINOR << 24) : 0));
+	return send_request(mesh, c, "%d %s %d %x", ACK, mesh->myport, c->estimated_weight, (c->options & 0xffffff) | (PROT_MINOR << 24));
 }
 
-static void send_everything(connection_t *c) {
+static void send_everything(meshlink_handle_t *mesh, connection_t *c) {
 	/* Send all known subnets and edges */
 
-	if(disablebuggypeers) {
-		static struct {
-			vpn_packet_t pkt;
-			char pad[MAXBUFSIZE - MAXSIZE];
-		} zeropkt;
-
-		memset(&zeropkt, 0, sizeof zeropkt);
-		zeropkt.pkt.len = MAXBUFSIZE;
-		send_tcppacket(c, &zeropkt.pkt);
-	}
-
-	if(tunnelserver) {
-		for splay_each(subnet_t, s, myself->subnet_tree)
-			send_add_subnet(c, s);
-
-		return;
-	}
-
-	for splay_each(node_t, n, node_tree) {
-		for splay_each(subnet_t, s, n->subnet_tree)
-			send_add_subnet(c, s);
-
+	for splay_each(node_t, n, mesh->nodes) {
 		for splay_each(edge_t, e, n->edge_tree)
-			send_add_edge(c, e);
+			send_add_edge(mesh, c, e);
 	}
 }
 
-static bool upgrade_h(connection_t *c, const char *request) {
-	char pubkey[MAX_STRING_SIZE];
-
-	if(sscanf(request, "%*d " MAX_STRING, pubkey) != 1) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Got bad %s from %s (%s)", "ACK", c->name, c->hostname);
-		return false;
-	}
-
-	if(ecdsa_active(c->ecdsa) || read_ecdsa_public_key(c)) {
-		logger(DEBUG_ALWAYS, LOG_INFO, "Already have ECDSA public key from %s (%s), not upgrading.", c->name, c->hostname);
-		return false;
-	}
-
-	logger(DEBUG_ALWAYS, LOG_INFO, "Got ECDSA public key from %s (%s), upgrading!", c->name, c->hostname);
-	append_config_file(c->name, "ECDSAPublicKey", pubkey);
-	c->allow_request = TERMREQ;
-	return send_termreq(c);
-}
-
-bool ack_h(connection_t *c, const char *request) {
-	if(c->protocol_minor == 1)
-		return upgrade_h(c, request);
-
+bool ack_h(meshlink_handle_t *mesh, connection_t *c, const char *request) {
 	char hisport[MAX_STRING_SIZE];
 	char *hisaddress;
 	int weight, mtu;
@@ -714,12 +393,12 @@ bool ack_h(connection_t *c, const char *request) {
 
 	/* Check if we already have a node_t for him */
 
-	n = lookup_node(c->name);
+	n = lookup_node(mesh, c->name);
 
 	if(!n) {
 		n = new_node();
 		n->name = xstrdup(c->name);
-		node_add(n);
+		node_add(mesh, n);
 	} else {
 		if(n->connection) {
 			/* Oh dear, we already have a connection to this node. */
@@ -734,9 +413,9 @@ bool ack_h(connection_t *c, const char *request) {
 				n->connection->outgoing = NULL;
 			}
 
-			terminate_connection(n->connection, false);
-			/* Run graph algorithm to purge key and make sure up/down scripts are rerun with new IP addresses and stuff */
-			graph();
+			terminate_connection(mesh, n->connection, false);
+			/* Run graph algorithm to keep things in sync */
+			graph(mesh);
 		}
 	}
 
@@ -748,19 +427,6 @@ bool ack_h(connection_t *c, const char *request) {
 	}
 	c->options |= options;
 
-	if(get_config_int(lookup_config(c->config_tree, "PMTU"), &mtu) && mtu < n->mtu)
-		n->mtu = mtu;
-
-	if(get_config_int(lookup_config(config_tree, "PMTU"), &mtu) && mtu < n->mtu)
-		n->mtu = mtu;
-
-	if(get_config_bool(lookup_config(c->config_tree, "ClampMSS"), &choice)) {
-		if(choice)
-			c->options |= OPTION_CLAMP_MSS;
-		else
-			c->options &= ~OPTION_CLAMP_MSS;
-	}
-
 	/* Activate this connection */
 
 	c->allow_request = ALL;
@@ -771,12 +437,12 @@ bool ack_h(connection_t *c, const char *request) {
 
 	/* Send him everything we know */
 
-	send_everything(c);
+	send_everything(mesh, c);
 
 	/* Create an edge_t for this connection */
 
 	c->edge = new_edge();
-	c->edge->from = myself;
+	c->edge->from = mesh->self;
 	c->edge->to = n;
 	sockaddr2str(&c->address, &hisaddress, NULL);
 	c->edge->address = str2sockaddr(hisaddress, hisport);
@@ -785,18 +451,15 @@ bool ack_h(connection_t *c, const char *request) {
 	c->edge->connection = c;
 	c->edge->options = c->options;
 
-	edge_add(c->edge);
+	edge_add(mesh, c->edge);
 
 	/* Notify everyone of the new edge */
 
-	if(tunnelserver)
-		send_add_edge(c, c->edge);
-	else
-		send_add_edge(everyone, c->edge);
+	send_add_edge(mesh, mesh->everyone, c->edge);
 
 	/* Run MST and SSSP algorithms */
 
-	graph();
+	graph(mesh);
 
 	return true;
 }