X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Finvitation.c;h=4a262a82ab862042ff49496fe9c6f20b153ddfe4;hp=5175ba92003c07be3c2a6a37833bc9d786db2126;hb=92d66492e0824674f68d26e787dd1ba4444a4601;hpb=9699f08afc6420d2bdac1063ea6789b585aaf42e

diff --git a/src/invitation.c b/src/invitation.c
index 5175ba92..4a262a82 100644
--- a/src/invitation.c
+++ b/src/invitation.c
@@ -1,6 +1,6 @@
 /*
     invitation.c -- Create and accept invitations
-    Copyright (C) 2013 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2013-2017 Guus Sliepen <guus@tinc-vpn.org>
 
     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
@@ -23,64 +23,97 @@
 #include "crypto.h"
 #include "ecdsa.h"
 #include "ecdsagen.h"
+#include "ifconfig.h"
 #include "invitation.h"
 #include "names.h"
 #include "netutl.h"
 #include "rsagen.h"
+#include "script.h"
 #include "sptps.h"
+#include "subnet.h"
 #include "tincctl.h"
 #include "utils.h"
 #include "xalloc.h"
 
+#include "ed25519/sha512.h"
+
 int addressfamily = AF_UNSPEC;
 
+static void scan_for_hostname(const char *filename, char **hostname, char **port) {
+	if(!filename || (*hostname && *port)) {
+		return;
+	}
+
+	FILE *f = fopen(filename, "r");
+
+	if(!f) {
+		return;
+	}
+
+	while(fgets(line, sizeof(line), f)) {
+		if(!rstrip(line)) {
+			continue;
+		}
+
+		char *p = line, *q;
+		p += strcspn(p, "\t =");
+
+		if(!*p) {
+			continue;
+		}
+
+		q = p + strspn(p, "\t ");
+
+		if(*q == '=') {
+			q += 1 + strspn(q + 1, "\t ");
+		}
+
+		*p = 0;
+		p = q + strcspn(q, "\t ");
+
+		if(*p) {
+			*p++ = 0;
+		}
+
+		p += strspn(p, "\t ");
+		p[strcspn(p, "\t ")] = 0;
+
+		if(!*port && !strcasecmp(line, "Port")) {
+			*port = xstrdup(q);
+		} else if(!*hostname && !strcasecmp(line, "Address")) {
+			*hostname = xstrdup(q);
+
+			if(*p) {
+				free(*port);
+				*port = xstrdup(p);
+			}
+		}
+
+		if(*hostname && *port) {
+			break;
+		}
+	}
+
+	fclose(f);
+}
+
 char *get_my_hostname() {
 	char *hostname = NULL;
 	char *port = NULL;
 	char *hostport = NULL;
 	char *name = get_my_name(false);
-	char *filename = NULL;
+	char filename[PATH_MAX] = {0};
 
 	// Use first Address statement in own host config file
 	if(check_id(name)) {
-		xasprintf(&filename, "%s" SLASH "hosts" SLASH "%s", confbase, name);
-		FILE *f = fopen(filename, "r");
-		if(f) {
-			while(fgets(line, sizeof line, f)) {
-				if(!rstrip(line))
-					continue;
-				char *p = line, *q;
-				p += strcspn(p, "\t =");
-				if(!*p)
-					continue;
-				q = p + strspn(p, "\t ");
-				if(*q == '=')
-					q += 1 + strspn(q + 1, "\t ");
-				*p = 0;
-				p = q + strcspn(q, "\t ");
-				if(*p)
-					*p++ = 0;
-				p += strspn(p, "\t ");
-				p[strcspn(p, "\t ")] = 0;
-				if(!port && !strcasecmp(line, "Port")) {
-					port = xstrdup(q);
-					continue;
-				}
-				if(strcasecmp(line, "Address"))
-					continue;
-				hostname = xstrdup(q);
-				if(*p) {
-					free(port);
-					port = xstrdup(p);
-				}
-				break;
-			}
-			fclose(f);
-		}
+		snprintf(filename, sizeof(filename), "%s" SLASH "hosts" SLASH "%s", confbase, name);
+		scan_for_hostname(filename, &hostname, &port);
+		scan_for_hostname(tinc_conf, &hostname, &port);
 	}
 
-	if(hostname)
+	if(hostname) {
 		goto done;
+	}
 
 	// If that doesn't work, guess externally visible hostname
 	fprintf(stderr, "Trying to discover externally visible hostname...\n");
@@ -90,39 +123,54 @@ char *get_my_hostname() {
 
 	while(aip) {
 		int s = socket(aip->ai_family, aip->ai_socktype, aip->ai_protocol);
+
 		if(s >= 0) {
 			if(connect(s, aip->ai_addr, aip->ai_addrlen)) {
 				closesocket(s);
 				s = -1;
 			}
 		}
+
 		if(s >= 0) {
-			send(s, request, sizeof request - 1, 0);
-			int len = recv(s, line, sizeof line - 1, MSG_WAITALL);
+			send(s, request, sizeof(request) - 1, 0);
+			int len = recv(s, line, sizeof(line) - 1, MSG_WAITALL);
+
 			if(len > 0) {
 				line[len] = 0;
-				if(line[len - 1] == '\n')
+
+				if(line[len - 1] == '\n') {
 					line[--len] = 0;
+				}
+
 				char *p = strrchr(line, '\n');
-				if(p && p[1])
+
+				if(p && p[1]) {
 					hostname = xstrdup(p + 1);
+				}
 			}
+
 			closesocket(s);
-			if(hostname)
+
+			if(hostname) {
 				break;
+			}
 		}
+
 		aip = aip->ai_next;
 		continue;
 	}
 
-	if(ai)
+	if(ai) {
 		freeaddrinfo(ai);
+	}
 
 	// Check that the hostname is reasonable
 	if(hostname) {
 		for(char *p = hostname; *p; p++) {
-			if(isalnum(*p) || *p == '-' || *p == '.' || *p == ':')
+			if(isalnum(*p) || *p == '-' || *p == '.' || *p == ':') {
 				continue;
+			}
+
 			// If not, forget it.
 			free(hostname);
 			hostname = NULL;
@@ -130,29 +178,43 @@ char *get_my_hostname() {
 		}
 	}
 
+	if(!tty) {
+		if(!hostname) {
+			fprintf(stderr, "Could not determine the external address or hostname. Please set Address manually.\n");
+			return NULL;
+		}
+
+		goto save;
+	}
+
 again:
-	printf("Please enter your host's external address or hostname");
-	if(hostname)
-		printf(" [%s]", hostname);
-	printf(": ");
-	fflush(stdout);
+	fprintf(stderr, "Please enter your host's external address or hostname");
+
+	if(hostname) {
+		fprintf(stderr, " [%s]", hostname);
+	}
+
+	fprintf(stderr, ": ");
 
-	if(!fgets(line, sizeof line, stdin)) {
+	if(!fgets(line, sizeof(line), stdin)) {
 		fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno));
 		free(hostname);
 		return NULL;
 	}
 
 	if(!rstrip(line)) {
-		if(hostname)
+		if(hostname) {
 			goto save;
-		else
+		} else {
 			goto again;
+		}
 	}
 
 	for(char *p = line; *p; p++) {
-		if(isalnum(*p) || *p == '-' || *p == '.')
+		if(isalnum(*p) || *p == '-' || *p == '.') {
 			continue;
+		}
+
 		fprintf(stderr, "Invalid address or hostname.\n");
 		goto again;
 	}
@@ -161,8 +223,10 @@ again:
 	hostname = xstrdup(line);
 
 save:
-	if(filename) {
+
+	if(*filename) {
 		FILE *f = fopen(filename, "a");
+
 		if(f) {
 			fprintf(f, "\nAddress = %s\n", hostname);
 			fclose(f);
@@ -172,24 +236,29 @@ save:
 	}
 
 done:
+
 	if(port) {
-		if(strchr(hostname, ':'))
+		if(strchr(hostname, ':')) {
 			xasprintf(&hostport, "[%s]:%s", hostname, port);
-		else
+		} else {
 			xasprintf(&hostport, "%s:%s", hostname, port);
+		}
 	} else {
-		hostport = hostname;
-		hostname = NULL;
+		if(strchr(hostname, ':')) {
+			xasprintf(&hostport, "[%s]", hostname);
+		} else {
+			hostport = xstrdup(hostname);
+		}
 	}
 
 	free(hostname);
 	free(port);
-	free(filename);
 	return hostport;
 }
 
 static bool fcopy(FILE *out, const char *filename) {
 	FILE *in = fopen(filename, "r");
+
 	if(!in) {
 		fprintf(stderr, "Could not open %s: %s\n", filename, strerror(errno));
 		return false;
@@ -197,8 +266,11 @@ static bool fcopy(FILE *out, const char *filename) {
 
 	char buf[1024];
 	size_t len;
-	while((len = fread(buf, 1, sizeof buf, in)))
+
+	while((len = fread(buf, 1, sizeof(buf), in))) {
 		fwrite(buf, len, 1, out);
+	}
+
 	fclose(in);
 	return true;
 }
@@ -215,32 +287,37 @@ int cmd_invite(int argc, char *argv[]) {
 		return 1;
 	}
 
-	char *myname = get_my_name(true);
-	if(!myname)
+	myname = get_my_name(true);
+
+	if(!myname) {
 		return 1;
+	}
 
 	// Ensure no host configuration file with that name exists
-	char *filename = NULL;
-	xasprintf(&filename, "%s" SLASH "hosts" SLASH "%s", confbase, argv[1]);
+	char filename[PATH_MAX];
+	snprintf(filename, sizeof(filename), "%s" SLASH "hosts" SLASH "%s", confbase, argv[1]);
+
 	if(!access(filename, F_OK)) {
-		free(filename);
 		fprintf(stderr, "A host config file for %s already exists!\n", argv[1]);
 		return 1;
 	}
-	free(filename);
 
-	// If a daemon is running, ensure no other nodes now about this name
-	bool found = false;
+	// If a daemon is running, ensure no other nodes know about this name
 	if(connect_tincd(false)) {
+		bool found = false;
 		sendline(fd, "%d %d", CONTROL, REQ_DUMP_NODES);
 
-		while(recvline(fd, line, sizeof line)) {
+		while(recvline(fd, line, sizeof(line))) {
 			char node[4096];
 			int code, req;
-			if(sscanf(line, "%d %d %s", &code, &req, node) != 3)
+
+			if(sscanf(line, "%d %d %4095s", &code, &req, node) != 3) {
 				break;
-			if(!strcmp(node, argv[1]))
+			}
+
+			if(!strcmp(node, argv[1])) {
 				found = true;
+			}
 		}
 
 		if(found) {
@@ -249,20 +326,18 @@ int cmd_invite(int argc, char *argv[]) {
 		}
 	}
 
-	char hash[25];
+	snprintf(filename, sizeof(filename), "%s" SLASH "invitations", confbase);
 
-	xasprintf(&filename, "%s" SLASH "invitations", confbase);
 	if(mkdir(filename, 0700) && errno != EEXIST) {
 		fprintf(stderr, "Could not create directory %s: %s\n", filename, strerror(errno));
-		free(filename);
 		return 1;
 	}
 
 	// Count the number of valid invitations, clean up old ones
 	DIR *dir = opendir(filename);
+
 	if(!dir) {
 		fprintf(stderr, "Could not read directory %s: %s\n", filename, strerror(errno));
-		free(filename);
 		return 1;
 	}
 
@@ -272,78 +347,93 @@ int cmd_invite(int argc, char *argv[]) {
 	time_t deadline = time(NULL) - 604800; // 1 week in the past
 
 	while((ent = readdir(dir))) {
-		if(strlen(ent->d_name) != 24)
+		if(strlen(ent->d_name) != 24) {
 			continue;
-		char *invname;
+		}
+
+		char invname[PATH_MAX];
 		struct stat st;
-		xasprintf(&invname, "%s" SLASH "%s", filename, ent->d_name);
+		snprintf(invname, sizeof(invname), "%s" SLASH "%s", filename, ent->d_name);
+
 		if(!stat(invname, &st)) {
-			if(deadline < st.st_mtime)
+			if(deadline < st.st_mtime) {
 				count++;
-			else
+			} else {
 				unlink(invname);
+			}
 		} else {
 			fprintf(stderr, "Could not stat %s: %s\n", invname, strerror(errno));
 			errno = 0;
 		}
-		free(invname);
 	}
 
+	closedir(dir);
+
 	if(errno) {
 		fprintf(stderr, "Error while reading directory %s: %s\n", filename, strerror(errno));
-		closedir(dir);
-		free(filename);
 		return 1;
 	}
-		
-	closedir(dir);
-	free(filename);
 
 	ecdsa_t *key;
-	xasprintf(&filename, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", confbase);
+	snprintf(filename, sizeof(filename), "%s" SLASH "invitations" SLASH "ed25519_key.priv", confbase);
 
 	// Remove the key if there are no outstanding invitations.
-	if(!count)
+	if(!count) {
 		unlink(filename);
+	}
 
 	// Create a new key if necessary.
 	FILE *f = fopen(filename, "r");
+
 	if(!f) {
 		if(errno != ENOENT) {
 			fprintf(stderr, "Could not read %s: %s\n", filename, strerror(errno));
-			free(filename);
 			return 1;
 		}
 
 		key = ecdsa_generate();
+
 		if(!key) {
-			free(filename);
 			return 1;
 		}
+
 		f = fopen(filename, "w");
+
 		if(!f) {
 			fprintf(stderr, "Could not write %s: %s\n", filename, strerror(errno));
-			free(filename);
 			return 1;
 		}
+
 		chmod(filename, 0600);
-		ecdsa_write_pem_private_key(key, f);
+
+		if(!ecdsa_write_pem_private_key(key, f)) {
+			fprintf(stderr, "Could not write ECDSA private key\n");
+			fclose(f);
+			return 1;
+		}
+
+		fclose(f);
+
+		if(connect_tincd(false)) {
+			sendline(fd, "%d %d", CONTROL, REQ_RELOAD);
+		}
 	} else {
 		key = ecdsa_read_pem_private_key(f);
-		if(!key)
+		fclose(f);
+
+		if(!key) {
 			fprintf(stderr, "Could not read private key from %s\n", filename);
+		}
 	}
-	fclose(f);
-	free(filename);
-	if(!key)
+
+	if(!key) {
 		return 1;
+	}
 
 	// Create a hash of the key.
+	char hash[64];
 	char *fingerprint = ecdsa_get_base64_public_key(key);
-	digest_t *digest = digest_open_by_name("sha256", 18);
-	if(!digest)
-		abort();
-	digest_create(digest, fingerprint, strlen(fingerprint), hash);
+	sha512(fingerprint, strlen(fingerprint), hash);
 	b64encode_urlsafe(hash, hash, 18);
 
 	// Create a random cookie for this invitation.
@@ -352,46 +442,85 @@ int cmd_invite(int argc, char *argv[]) {
 
 	// Create a filename that doesn't reveal the cookie itself
 	char buf[18 + strlen(fingerprint)];
-	char cookiehash[25];
+	char cookiehash[64];
 	memcpy(buf, cookie, 18);
-	memcpy(buf + 18, fingerprint, sizeof buf - 18);
-	digest_create(digest, buf, sizeof buf, cookiehash);
+	memcpy(buf + 18, fingerprint, sizeof(buf) - 18);
+	sha512(buf, sizeof(buf), cookiehash);
 	b64encode_urlsafe(cookiehash, cookiehash, 18);
 
 	b64encode_urlsafe(cookie, cookie, 18);
 
 	// Create a file containing the details of the invitation.
-	xasprintf(&filename, "%s" SLASH "invitations" SLASH "%s", confbase, cookiehash);
+	snprintf(filename, sizeof(filename), "%s" SLASH "invitations" SLASH "%s", confbase, cookiehash);
 	int ifd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600);
+
 	if(!ifd) {
 		fprintf(stderr, "Could not create invitation file %s: %s\n", filename, strerror(errno));
-		free(filename);
 		return 1;
 	}
-	free(filename);
+
 	f = fdopen(ifd, "w");
-	if(!f)
+
+	if(!f) {
 		abort();
+	}
 
 	// Get the local address
 	char *address = get_my_hostname();
 
 	// Fill in the details.
 	fprintf(f, "Name = %s\n", argv[1]);
-	if(netname)
+
+	if(check_netname(netname, true)) {
 		fprintf(f, "NetName = %s\n", netname);
+	}
+
 	fprintf(f, "ConnectTo = %s\n", myname);
-	// TODO: copy Broadcast and Mode
+
+	// Copy Broadcast and Mode
+	FILE *tc = fopen(tinc_conf, "r");
+
+	if(tc) {
+		char buf[1024];
+
+		while(fgets(buf, sizeof(buf), tc)) {
+			if((!strncasecmp(buf, "Mode", 4) && strchr(" \t=", buf[4]))
+			                || (!strncasecmp(buf, "Broadcast", 9) && strchr(" \t=", buf[9]))) {
+				fputs(buf, f);
+
+				// Make sure there is a newline character.
+				if(!strchr(buf, '\n')) {
+					fputc('\n', f);
+				}
+			}
+		}
+
+		fclose(tc);
+	}
+
 	fprintf(f, "#---------------------------------------------------------------#\n");
 	fprintf(f, "Name = %s\n", myname);
 
-	xasprintf(&filename, "%s" SLASH "hosts" SLASH "%s", confbase, myname);
-	fcopy(f, filename);
+	char filename2[PATH_MAX];
+	snprintf(filename2, sizeof(filename2), "%s" SLASH "hosts" SLASH "%s", confbase, myname);
+	fcopy(f, filename2);
 	fclose(f);
 
 	// Create an URL from the local address, key hash and cookie
-	printf("%s/%s%s\n", address, hash, cookie);
-	free(filename);
+	char *url;
+	xasprintf(&url, "%s/%s%s", address, hash, cookie);
+
+	// Call the inviation-created script
+	environment_t env;
+	environment_init(&env);
+	environment_add(&env, "NODE=%s", argv[1]);
+	environment_add(&env, "INVITATION_FILE=%s", filename);
+	environment_add(&env, "INVITATION_URL=%s", url);
+	execute_script("invitation-created", &env);
+	environment_exit(&env);
+
+	puts(url);
+	free(url);
 	free(address);
 
 	return 0;
@@ -407,10 +536,11 @@ static bool success = false;
 static char cookie[18], hash[18];
 
 static char *get_line(const char **data) {
-	if(!data || !*data)
+	if(!data || !*data) {
 		return NULL;
+	}
 
-	if(!**data) {
+	if(! **data) {
 		*data = NULL;
 		return NULL;
 	}
@@ -418,36 +548,48 @@ static char *get_line(const char **data) {
 	static char line[1024];
 	const char *end = strchr(*data, '\n');
 	size_t len = end ? end - *data : strlen(*data);
-	if(len >= sizeof line) {
+
+	if(len >= sizeof(line)) {
 		fprintf(stderr, "Maximum line length exceeded!\n");
 		return NULL;
 	}
-	if(len && !isprint(**data))
+
+	if(len && !isprint(**data)) {
 		abort();
+	}
 
 	memcpy(line, *data, len);
 	line[len] = 0;
 
-	if(end)
+	if(end) {
 		*data = end + 1;
-	else
+	} else {
 		*data = NULL;
+	}
 
 	return line;
 }
 
 static char *get_value(const char *data, const char *var) {
 	char *line = get_line(&data);
-	if(!line)
+
+	if(!line) {
 		return NULL;
+	}
 
 	char *sep = line + strcspn(line, " \t=");
 	char *val = sep + strspn(sep, " \t");
-	if(*val == '=')
+
+	if(*val == '=') {
 		val += 1 + strspn(val + 1, " \t");
+	}
+
 	*sep = 0;
-	if(strcasecmp(line, var))
+
+	if(strcasecmp(line, var)) {
 		return NULL;
+	}
+
 	return val;
 }
 
@@ -460,25 +602,32 @@ static char *grep(const char *data, const char *var) {
 	// Skip all lines not starting with var
 	while(strncasecmp(p, var, varlen) || !strchr(" \t=", p[varlen])) {
 		p = strchr(p, '\n');
-		if(!p)
+
+		if(!p) {
 			break;
-		else
+		} else {
 			p++;
+		}
 	}
 
-	if(!p)
+	if(!p) {
 		return NULL;
+	}
 
 	p += varlen;
 	p += strspn(p, " \t");
-	if(*p == '=')
+
+	if(*p == '=') {
 		p += 1 + strspn(p + 1, " \t");
+	}
 
 	const char *e = strchr(p, '\n');
-	if(!e)
+
+	if(!e) {
 		return xstrdup(p);
+	}
 
-	if(e - p >= sizeof value) {
+	if(e - p >= sizeof(value)) {
 		fprintf(stderr, "Maximum line length exceeded!\n");
 		return NULL;
 	}
@@ -490,29 +639,37 @@ static char *grep(const char *data, const char *var) {
 
 static bool finalize_join(void) {
 	char *name = xstrdup(get_value(data, "Name"));
+
 	if(!name) {
 		fprintf(stderr, "No Name found in invitation!\n");
 		return false;
 	}
 
 	if(!check_id(name)) {
-		fprintf(stderr, "Invalid Name found in invitation: %s!\n", name);
+		fprintf(stderr, "Invalid Name found in invitation!\n");
 		return false;
 	}
 
-	if(!netname)
+	if(!netname) {
 		netname = grep(data, "NetName");
 
+		if(netname && !check_netname(netname, true)) {
+			fprintf(stderr, "Unsafe NetName found in invitation!\n");
+			return false;
+		}
+	}
+
 	bool ask_netname = false;
 	char temp_netname[32];
 
 make_names:
+
 	if(!confbasegiven) {
 		free(confbase);
 		confbase = NULL;
 	}
 
-	make_names();
+	make_names(false);
 
 	free(tinc_conf);
 	free(hosts_dir);
@@ -522,15 +679,17 @@ make_names:
 
 	if(!access(tinc_conf, F_OK)) {
 		fprintf(stderr, "Configuration file %s already exists!\n", tinc_conf);
-		if(!tty || confbasegiven)
+
+		if(confbasegiven) {
 			return false;
+		}
 
 		// Generate a random netname, ask for a better one later.
 		ask_netname = true;
-		snprintf(temp_netname, sizeof temp_netname, "join_%x", rand());
+		snprintf(temp_netname, sizeof(temp_netname), "join_%x", rand());
 		netname = temp_netname;
 		goto make_names;
-	}	
+	}
 
 	if(mkdir(confbase, 0777) && errno != EEXIST) {
 		fprintf(stderr, "Could not create directory %s: %s\n", confbase, strerror(errno));
@@ -543,6 +702,7 @@ make_names:
 	}
 
 	FILE *f = fopen(tinc_conf, "w");
+
 	if(!f) {
 		fprintf(stderr, "Could not create file %s: %s\n", tinc_conf, strerror(errno));
 		return false;
@@ -550,53 +710,114 @@ make_names:
 
 	fprintf(f, "Name = %s\n", name);
 
-	char *filename;
-	xasprintf(&filename, "%s" SLASH "%s", hosts_dir, name);
+	char filename[PATH_MAX];
+	snprintf(filename, sizeof(filename), "%s" SLASH "%s", hosts_dir, name);
 	FILE *fh = fopen(filename, "w");
+
 	if(!fh) {
 		fprintf(stderr, "Could not create file %s: %s\n", filename, strerror(errno));
+		fclose(f);
+		return false;
+	}
+
+	snprintf(filename, sizeof(filename), "%s" SLASH "invitation-data", confbase);
+	FILE *finv = fopen(filename, "w");
+
+	if(!finv || fwrite(data, datalen, 1, finv) != 1) {
+		fprintf(stderr, "Could not create file %s: %s\n", filename, strerror(errno));
+		fclose(fh);
+		fclose(f);
+		fclose(finv);
 		return false;
 	}
 
+	fclose(finv);
+
+	snprintf(filename, sizeof(filename), "%s" SLASH "tinc-up.invitation", confbase);
+	FILE *fup = fopen(filename, "w");
+
+	if(!fup) {
+		fprintf(stderr, "Could not create file %s: %s\n", filename, strerror(errno));
+		fclose(f);
+		fclose(fh);
+		return false;
+	}
+
+	ifconfig_header(fup);
+
 	// Filter first chunk on approved keywords, split between tinc.conf and hosts/Name
+	// Generate a tinc-up script from Ifconfig and Route keywords.
 	// Other chunks go unfiltered to their respective host config files
 	const char *p = data;
 	char *l, *value;
 
 	while((l = get_line(&p))) {
 		// Ignore comments
-		if(*l == '#')
+		if(*l == '#') {
 			continue;
+		}
 
 		// Split line into variable and value
 		int len = strcspn(l, "\t =");
 		value = l + len;
 		value += strspn(value, "\t ");
+
 		if(*value == '=') {
 			value++;
 			value += strspn(value, "\t ");
 		}
+
 		l[len] = 0;
 
+		// Ignore lines with empty variable names
+		if(!*l) {
+			continue;
+		}
+
 		// Is it a Name?
-		if(!strcasecmp(l, "Name"))
-			if(strcmp(value, name))
+		if(!strcasecmp(l, "Name")) {
+			if(strcmp(value, name)) {
 				break;
-			else
+			} else {
 				continue;
-		else if(!strcasecmp(l, "NetName"))
+			}
+		} else if(!strcasecmp(l, "NetName")) {
 			continue;
+		}
 
 		// Check the list of known variables
 		bool found = false;
 		int i;
+
 		for(i = 0; variables[i].name; i++) {
-			if(strcasecmp(l, variables[i].name))
+			if(strcasecmp(l, variables[i].name)) {
 				continue;
+			}
+
 			found = true;
 			break;
 		}
 
+		// Handle Ifconfig and Route statements
+		if(!found) {
+			if(!strcasecmp(l, "Ifconfig")) {
+				if(!strcasecmp(value, "dhcp")) {
+					ifconfig_dhcp(fup);
+				} else if(!strcasecmp(value, "dhcp6")) {
+					ifconfig_dhcp6(fup);
+				} else if(!strcasecmp(value, "slaac")) {
+					ifconfig_slaac(fup);
+				} else {
+					ifconfig_address(fup, value);
+				}
+
+				continue;
+			} else if(!strcasecmp(l, "Route")) {
+				ifconfig_route(fup, value);
+				continue;
+			}
+		}
+
 		// Ignore unknown and unsafe variables
 		if(!found) {
 			fprintf(stderr, "Ignoring unknown variable '%s' in invitation.\n", l);
@@ -607,11 +828,12 @@ make_names:
 		}
 
 		// Copy the safe variable to the right config file
-		fprintf(variables[i].type & VAR_HOST ? fh : f, "%s = %s\n", l, value);
+		fprintf((variables[i].type & VAR_HOST) ? fh : f, "%s = %s\n", l, value);
 	}
 
 	fclose(f);
-	free(filename);
+	bool valid_tinc_up = ifconfig_footer(fup);
+	fclose(fup);
 
 	while(l && !strcasecmp(l, "Name")) {
 		if(!check_id(value)) {
@@ -624,7 +846,7 @@ make_names:
 			return false;
 		}
 
-		xasprintf(&filename, "%s" SLASH "%s", hosts_dir, value);
+		snprintf(filename, sizeof(filename), "%s" SLASH "%s", hosts_dir, value);
 		f = fopen(filename, "w");
 
 		if(!f) {
@@ -633,16 +855,21 @@ make_names:
 		}
 
 		while((l = get_line(&p))) {
-			if(!strcmp(l, "#---------------------------------------------------------------#"))
+			if(!strcmp(l, "#---------------------------------------------------------------#")) {
 				continue;
+			}
+
 			int len = strcspn(l, "\t =");
+
 			if(len == 4 && !strncasecmp(l, "Name", 4)) {
 				value = l + len;
 				value += strspn(value, "\t ");
+
 				if(*value == '=') {
 					value++;
 					value += strspn(value, "\t ");
 				}
+
 				l[len] = 0;
 				break;
 			}
@@ -652,21 +879,28 @@ make_names:
 		}
 
 		fclose(f);
-		free(filename);
 	}
 
 	// Generate our key and send a copy to the server
 	ecdsa_t *key = ecdsa_generate();
-	if(!key)
+
+	if(!key) {
 		return false;
+	}
 
 	char *b64key = ecdsa_get_base64_public_key(key);
-	if(!b64key)
+
+	if(!b64key) {
 		return false;
+	}
 
-	xasprintf(&filename, "%s" SLASH "ecdsa_key.priv", confbase);
+	snprintf(filename, sizeof(filename), "%s" SLASH "ed25519_key.priv", confbase);
 	f = fopenmask(filename, "w", 0600);
 
+	if(!f) {
+		return false;
+	}
+
 	if(!ecdsa_write_pem_private_key(key, f)) {
 		fprintf(stderr, "Error writing private key!\n");
 		ecdsa_free(key);
@@ -676,92 +910,168 @@ make_names:
 
 	fclose(f);
 
-	fprintf(fh, "ECDSAPublicKey = %s\n", b64key);
+	fprintf(fh, "Ed25519PublicKey = %s\n", b64key);
 
 	sptps_send_record(&sptps, 1, b64key, strlen(b64key));
 	free(b64key);
+	ecdsa_free(key);
 
-
+#ifndef DISABLE_LEGACY
 	rsa_t *rsa = rsa_generate(2048, 0x1001);
-	xasprintf(&filename, "%s" SLASH "rsa_key.priv", confbase);
+	snprintf(filename, sizeof(filename), "%s" SLASH "rsa_key.priv", confbase);
 	f = fopenmask(filename, "w", 0600);
 
-	rsa_write_pem_private_key(rsa, f);
+	if(!f || !rsa_write_pem_private_key(rsa, f)) {
+		fprintf(stderr, "Could not write private RSA key\n");
+	} else if(!rsa_write_pem_public_key(rsa, fh)) {
+		fprintf(stderr, "Could not write public RSA key\n");
+	}
+
 	fclose(f);
 
-	rsa_write_pem_public_key(rsa, fh);
 	fclose(fh);
 
-	ecdsa_free(key);
 	rsa_free(rsa);
+#endif
 
 	check_port(name);
 
 ask_netname:
-	if(ask_netname) {
+
+	if(ask_netname && tty) {
 		fprintf(stderr, "Enter a new netname: ");
-		if(!fgets(line, sizeof line, stdin)) {
+
+		if(!fgets(line, sizeof(line), stdin)) {
 			fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno));
 			return false;
 		}
-		if(!*line || *line == '\n')
+
+		if(!*line || *line == '\n') {
 			goto ask_netname;
+		}
 
 		line[strlen(line) - 1] = 0;
 
-		char *newbase;
-		xasprintf(&newbase, CONFDIR SLASH "tinc" SLASH "%s", line);
+		char newbase[PATH_MAX];
+		snprintf(newbase, sizeof(newbase), CONFDIR SLASH "tinc" SLASH "%s", line);
+
 		if(rename(confbase, newbase)) {
 			fprintf(stderr, "Error trying to rename %s to %s: %s\n", confbase, newbase, strerror(errno));
-			free(newbase);
 			goto ask_netname;
 		}
 
-		free(newbase);
 		netname = line;
-		make_names();
+		make_names(false);
+	}
+
+	char filename2[PATH_MAX];
+	snprintf(filename, sizeof(filename), "%s" SLASH "tinc-up.invitation", confbase);
+	snprintf(filename2, sizeof(filename2), "%s" SLASH "tinc-up", confbase);
+
+	if(valid_tinc_up) {
+		if(tty) {
+			FILE *fup = fopen(filename, "r");
+
+			if(fup) {
+				fprintf(stderr, "\nPlease review the following tinc-up script:\n\n");
+
+				char buf[MAXSIZE];
+
+				while(fgets(buf, sizeof(buf), fup)) {
+					fputs(buf, stderr);
+				}
+
+				fclose(fup);
+
+				int response = 0;
+
+				do {
+					fprintf(stderr, "\nDo you want to use this script [y]es/[n]o/[e]dit? ");
+					response = tolower(getchar());
+				} while(!strchr("yne", response));
+
+				fprintf(stderr, "\n");
+
+				if(response == 'e') {
+					char *command;
+#ifndef HAVE_MINGW
+					xasprintf(&command, "\"%s\" \"%s\"", getenv("VISUAL") ? : getenv("EDITOR") ? : "vi", filename);
+#else
+					xasprintf(&command, "edit \"%s\"", filename);
+#endif
+
+					if(system(command)) {
+						response = 'n';
+					} else {
+						response = 'y';
+					}
+
+					free(command);
+				}
+
+				if(response == 'y') {
+					rename(filename, filename2);
+					chmod(filename2, 0755);
+					fprintf(stderr, "tinc-up enabled.\n");
+				} else {
+					fprintf(stderr, "tinc-up has been left disabled.\n");
+				}
+			}
+		} else {
+			fprintf(stderr, "A tinc-up script was generated, but has been left disabled.\n");
+		}
+	} else {
+		// A placeholder was generated.
+		rename(filename, filename2);
+		chmod(filename2, 0755);
 	}
 
+	fprintf(stderr, "Configuration stored in: %s\n", confbase);
+
 	return true;
 }
 
 
-static bool invitation_send(void *handle, uint8_t type, const char *data, size_t len) {
+static bool invitation_send(void *handle, uint8_t type, const void *data, size_t len) {
 	while(len) {
 		int result = send(sock, data, len, 0);
-		if(result == -1 && errno == EINTR)
+
+		if(result == -1 && errno == EINTR) {
 			continue;
-		else if(result <= 0)
+		} else if(result <= 0) {
 			return false;
+		}
+
 		data += result;
 		len -= result;
 	}
+
 	return true;
 }
 
-static bool invitation_receive(void *handle, uint8_t type, const char *msg, uint16_t len) {
+static bool invitation_receive(void *handle, uint8_t type, const void *msg, uint16_t len) {
 	switch(type) {
-		case SPTPS_HANDSHAKE:
-			return sptps_send_record(&sptps, 0, cookie, sizeof cookie);
-
-		case 0:
-			data = xrealloc(data, datalen + len + 1);
-			memcpy(data + datalen, msg, len);
-			datalen += len;
-			data[datalen] = 0;
-			break;
-
-		case 1:
-			return finalize_join();
-
-		case 2:
-			fprintf(stderr, "Invitation succesfully accepted.\n");
-			shutdown(sock, SHUT_RDWR);
-			success = true;
-			break;
-
-		default:
-			return false;
+	case SPTPS_HANDSHAKE:
+		return sptps_send_record(&sptps, 0, cookie, sizeof(cookie));
+
+	case 0:
+		data = xrealloc(data, datalen + len + 1);
+		memcpy(data + datalen, msg, len);
+		datalen += len;
+		data[datalen] = 0;
+		break;
+
+	case 1:
+		return finalize_join();
+
+	case 2:
+		fprintf(stderr, "Invitation successfully accepted.\n");
+		shutdown(sock, SHUT_RDWR);
+		success = true;
+		break;
+
+	default:
+		return false;
 	}
 
 	return true;
@@ -778,7 +1088,7 @@ int cmd_join(int argc, char *argv[]) {
 	}
 
 	// Make sure confbase exists and is accessible.
-	if(strcmp(confdir, confbase) && mkdir(confdir, 0755) && errno != EEXIST) {
+	if(!confbase_given && mkdir(confdir, 0755) && errno != EEXIST) {
 		fprintf(stderr, "Could not create directory %s: %s\n", confdir, strerror(errno));
 		return 1;
 	}
@@ -806,14 +1116,16 @@ int cmd_join(int argc, char *argv[]) {
 		invitation = argv[1];
 	} else {
 		if(tty) {
-			printf("Enter invitation URL: ");
-			fflush(stdout);
+			fprintf(stderr, "Enter invitation URL: ");
 		}
+
 		errno = EPIPE;
-		if(!fgets(line, sizeof line, stdin)) {
+
+		if(!fgets(line, sizeof(line), stdin)) {
 			fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno));
 			return false;
 		}
+
 		invitation = line;
 	}
 
@@ -821,122 +1133,177 @@ int cmd_join(int argc, char *argv[]) {
 	rstrip(line);
 
 	char *slash = strchr(invitation, '/');
-	if(!slash)
+
+	if(!slash) {
 		goto invalid;
+	}
 
 	*slash++ = 0;
 
-	if(strlen(slash) != 48)
+	if(strlen(slash) != 48) {
 		goto invalid;
+	}
 
 	char *address = invitation;
 	char *port = NULL;
+
 	if(*address == '[') {
 		address++;
 		char *bracket = strchr(address, ']');
-		if(!bracket)
+
+		if(!bracket) {
 			goto invalid;
+		}
+
 		*bracket = 0;
-		if(bracket[1] == ':')
+
+		if(bracket[1] == ':') {
 			port = bracket + 2;
+		}
 	} else {
 		port = strchr(address, ':');
-		if(port)
+
+		if(port) {
 			*port++ = 0;
+		}
 	}
 
-	if(!port || !*port)
+	if(!port || !*port) {
 		port = "655";
+	}
 
-	if(!b64decode(slash, hash, 18) || !b64decode(slash + 24, cookie, 18))
+	if(!b64decode(slash, hash, 24) || !b64decode(slash + 24, cookie, 24)) {
 		goto invalid;
+	}
 
 	// Generate a throw-away key for the invitation.
 	ecdsa_t *key = ecdsa_generate();
-	if(!key)
+
+	if(!key) {
 		return 1;
+	}
 
 	char *b64key = ecdsa_get_base64_public_key(key);
 
 	// Connect to the tinc daemon mentioned in the URL.
 	struct addrinfo *ai = str2addrinfo(address, port, SOCK_STREAM);
-	if(!ai)
+
+	if(!ai) {
 		return 1;
+	}
+
+	struct addrinfo *aip = NULL;
+
+next:
+	if(!aip) {
+		aip = ai;
+	} else {
+		aip = aip->ai_next;
+
+		if(!aip) {
+			freeaddrinfo(ai);
+			return 1;
+		}
+	}
+
+	sock = socket(aip->ai_family, aip->ai_socktype, aip->ai_protocol);
 
-	sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
 	if(sock <= 0) {
 		fprintf(stderr, "Could not open socket: %s\n", strerror(errno));
-		return 1;
+		goto next;
 	}
 
-	if(connect(sock, ai->ai_addr, ai->ai_addrlen)) {
-		fprintf(stderr, "Could not connect to %s port %s: %s\n", address, port, strerror(errno));
+	if(connect(sock, aip->ai_addr, aip->ai_addrlen)) {
+		char *addrstr, *portstr;
+		sockaddr2str((sockaddr_t *)aip->ai_addr, &addrstr, &portstr);
+		fprintf(stderr, "Could not connect to %s port %s: %s\n", addrstr, portstr, strerror(errno));
+		free(addrstr);
+		free(portstr);
 		closesocket(sock);
-		return 1;
+		goto next;
 	}
 
 	fprintf(stderr, "Connected to %s port %s...\n", address, port);
 
 	// Tell him we have an invitation, and give him our throw-away key.
-	int len = snprintf(line, sizeof line, "0 ?%s %d.%d\n", b64key, PROT_MAJOR, PROT_MINOR);
-	if(len <= 0 || len >= sizeof line)
+	int len = snprintf(line, sizeof(line), "0 ?%s %d.%d\n", b64key, PROT_MAJOR, PROT_MINOR);
+
+	if(len <= 0 || len >= sizeof(line)) {
 		abort();
+	}
 
 	if(!sendline(sock, "0 ?%s %d.%d", b64key, PROT_MAJOR, 1)) {
 		fprintf(stderr, "Error sending request to %s port %s: %s\n", address, port, strerror(errno));
 		closesocket(sock);
-		return 1;
+		goto next;
 	}
 
 	char hisname[4096] = "";
 	int code, hismajor, hisminor = 0;
 
-	if(!recvline(sock, line, sizeof line) || sscanf(line, "%d %s %d.%d", &code, hisname, &hismajor, &hisminor) < 3 || code != 0 || hismajor != PROT_MAJOR || !check_id(hisname) || !recvline(sock, line, sizeof line) || !rstrip(line) || sscanf(line, "%d ", &code) != 1 || code != ACK || strlen(line) < 3) {
+	if(!recvline(sock, line, sizeof(line)) || sscanf(line, "%d %4095s %d.%d", &code, hisname, &hismajor, &hisminor) < 3 || code != 0 || hismajor != PROT_MAJOR || !check_id(hisname) || !recvline(sock, line, sizeof(line)) || !rstrip(line) || sscanf(line, "%d ", &code) != 1 || code != ACK || strlen(line) < 3) {
 		fprintf(stderr, "Cannot read greeting from peer\n");
 		closesocket(sock);
-		return 1;
+		goto next;
 	}
 
+	freeaddrinfo(ai);
+
 	// Check if the hash of the key he gave us matches the hash in the URL.
 	char *fingerprint = line + 2;
-	digest_t *digest = digest_open_by_name("sha256", 18);
-	if(!digest)
-		abort();
-	char hishash[18];
-	if(!digest_create(digest, fingerprint, strlen(fingerprint), hishash)) {
+	char hishash[64];
+
+	if(sha512(fingerprint, strlen(fingerprint), hishash)) {
 		fprintf(stderr, "Could not create digest\n%s\n", line + 2);
 		return 1;
 	}
+
 	if(memcmp(hishash, hash, 18)) {
 		fprintf(stderr, "Peer has an invalid key!\n%s\n", line + 2);
 		return 1;
 
 	}
-	
+
 	ecdsa_t *hiskey = ecdsa_set_base64_public_key(fingerprint);
-	if(!hiskey)
+
+	if(!hiskey) {
 		return 1;
+	}
 
 	// Start an SPTPS session
-	if(!sptps_start(&sptps, NULL, true, false, key, hiskey, "tinc invitation", 15, invitation_send, invitation_receive))
+	if(!sptps_start(&sptps, NULL, true, false, key, hiskey, "tinc invitation", 15, invitation_send, invitation_receive)) {
 		return 1;
+	}
 
 	// Feed rest of input buffer to SPTPS
-	if(!sptps_receive_data(&sptps, buffer, blen))
+	if(!sptps_receive_data(&sptps, buffer, blen)) {
 		return 1;
+	}
 
-	while((len = recv(sock, line, sizeof line, 0))) {
+	while((len = recv(sock, line, sizeof(line), 0))) {
 		if(len < 0) {
-			if(errno == EINTR)
+			if(errno == EINTR) {
 				continue;
+			}
+
 			fprintf(stderr, "Error reading data from %s port %s: %s\n", address, port, strerror(errno));
 			return 1;
 		}
 
-		if(!sptps_receive_data(&sptps, line, len))
-			return 1;
+		char *p = line;
+
+		while(len) {
+			int done = sptps_receive_data(&sptps, p, len);
+
+			if(!done) {
+				return 1;
+			}
+
+			len -= done;
+			p += done;
+		}
 	}
-	
+
 	sptps_stop(&sptps);
 	ecdsa_free(hiskey);
 	ecdsa_free(key);