X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Finvitation.c;h=7fb96dacf00cb414e417f05964945c47e44a71ab;hb=f0e7e6b03e34e69cac5b01a2d943ad3b9b59d36c;hp=36dfa41b64b1d2a62a04f66d66006e72c4a987ba;hpb=82575bd44dc02bd1febd265c1db0f05b298329af;p=tinc

diff --git a/src/invitation.c b/src/invitation.c
index 36dfa41b..7fb96dac 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-2014 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
@@ -35,6 +35,48 @@
 
 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;
@@ -45,39 +87,8 @@ char *get_my_hostname() {
 	// 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);
-		}
+		scan_for_hostname(filename, &hostname, &port);
+		scan_for_hostname(tinc_conf, &hostname, &port);
 	}
 
 	if(hostname)
@@ -131,12 +142,19 @@ 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");
+	fprintf(stderr, "Please enter your host's external address or hostname");
 	if(hostname)
-		printf(" [%s]", hostname);
-	printf(": ");
-	fflush(stdout);
+		fprintf(stderr, " [%s]", hostname);
+	fprintf(stderr, ": ");
 
 	if(!fgets(line, sizeof line, stdin)) {
 		fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno));
@@ -179,8 +197,10 @@ done:
 		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);
@@ -230,7 +250,7 @@ int cmd_invite(int argc, char *argv[]) {
 	}
 	free(filename);
 
-	// If a daemon is running, ensure no other nodes now about this name
+	// If a daemon is running, ensure no other nodes know about this name
 	bool found = false;
 	if(connect_tincd(false)) {
 		sendline(fd, "%d %d", CONTROL, REQ_DUMP_NODES);
@@ -301,7 +321,7 @@ int cmd_invite(int argc, char *argv[]) {
 	free(filename);
 
 	ecdsa_t *key;
-	xasprintf(&filename, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", confbase);
+	xasprintf(&filename, "%s" SLASH "invitations" SLASH "ed25519_key.priv", confbase);
 
 	// Remove the key if there are no outstanding invitations.
 	if(!count)
@@ -329,12 +349,17 @@ int cmd_invite(int argc, char *argv[]) {
 		}
 		chmod(filename, 0600);
 		ecdsa_write_pem_private_key(key, f);
+		fclose(f);
+
+		if(connect_tincd(false))
+			sendline(fd, "%d %d", CONTROL, REQ_RELOAD);
 	} else {
 		key = ecdsa_read_pem_private_key(f);
+		fclose(f);
 		if(!key)
 			fprintf(stderr, "Could not read private key from %s\n", filename);
 	}
-	fclose(f);
+
 	free(filename);
 	if(!key)
 		return 1;
@@ -388,8 +413,12 @@ int cmd_invite(int argc, char *argv[]) {
 		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])))
+					|| (!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);
 	}
@@ -551,7 +580,7 @@ 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.
@@ -693,7 +722,7 @@ make_names:
 	if(!b64key)
 		return false;
 
-	xasprintf(&filename, "%s" SLASH "ecdsa_key.priv", confbase);
+	xasprintf(&filename, "%s" SLASH "ed25519_key.priv", confbase);
 	f = fopenmask(filename, "w", 0600);
 
 	if(!ecdsa_write_pem_private_key(key, f)) {
@@ -705,7 +734,7 @@ 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);
@@ -727,7 +756,7 @@ make_names:
 	check_port(name);
 
 ask_netname:
-	if(ask_netname) {
+	if(ask_netname && tty) {
 		fprintf(stderr, "Enter a new netname: ");
 		if(!fgets(line, sizeof line, stdin)) {
 			fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno));
@@ -751,6 +780,8 @@ ask_netname:
 		make_names();
 	}
 
+	fprintf(stderr, "Configuration stored in: %s\n", confbase);
+
 	return true;
 }
 
@@ -807,7 +838,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;
 	}
@@ -834,10 +865,8 @@ int cmd_join(int argc, char *argv[]) {
 	if(argc > 1) {
 		invitation = argv[1];
 	} else {
-		if(tty) {
-			printf("Enter invitation URL: ");
-			fflush(stdout);
-		}
+		if(tty)
+			fprintf(stderr, "Enter invitation URL: ");
 		errno = EPIPE;
 		if(!fgets(line, sizeof line, stdin)) {
 			fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno));