X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincctl.c;h=abc5c095a82c5d07a977c4c3ddbc0e5be81955ee;hp=e0a6086e8f89b9b44f3ce9d328656c16206efb8c;hb=0c7e0210d900185d4c1a9ffd969dc2a26d9523a9;hpb=58e8f598f38dbb2f210d8a62c8fb4b46513dc39f

diff --git a/src/tincctl.c b/src/tincctl.c
index e0a6086e..abc5c095 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -89,7 +89,7 @@ static struct option const long_options[] = {
 static void version(void) {
 	printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
 		   BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
-	printf("Copyright (C) 1998-2014 Ivo Timmermans, Guus Sliepen and others.\n"
+	printf("Copyright (C) 1998-2015 Ivo Timmermans, Guus Sliepen and others.\n"
 			"See the AUTHORS file for a complete list.\n\n"
 			"tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
 			"and you are welcome to redistribute it under certain conditions;\n"
@@ -233,6 +233,12 @@ FILE *fopenmask(const char *filename, const char *mode, mode_t perms) {
 	perms &= ~mask;
 	umask(~perms);
 	FILE *f = fopen(filename, mode);
+
+	if(!f) {
+		fprintf(stderr, "Could not open %s: %s\n", filename, strerror(errno));
+		return NULL;
+	}
+
 #ifdef HAVE_FCHMOD
 	if((perms & 0444) && f)
 		fchmod(fileno(f), perms);
@@ -376,7 +382,7 @@ static FILE *ask_and_open(const char *filename, const char *what, const char *mo
 static bool ed25519_keygen(bool ask) {
 	ecdsa_t *key;
 	FILE *f;
-	char *pubname, *privname;
+	char fname[PATH_MAX];
 
 	fprintf(stderr, "Generating Ed25519 keypair:\n");
 
@@ -386,29 +392,25 @@ static bool ed25519_keygen(bool ask) {
 	} else
 		fprintf(stderr, "Done.\n");
 
-	xasprintf(&privname, "%s" SLASH "ed25519_key.priv", confbase);
-	f = ask_and_open(privname, "private Ed25519 key", "a", ask, 0600);
-	free(privname);
+	snprintf(fname, sizeof fname, "%s" SLASH "ed25519_key.priv", confbase);
+	f = ask_and_open(fname, "private Ed25519 key", "a", ask, 0600);
 
 	if(!f)
-		return false;
+		goto error;
 
 	if(!ecdsa_write_pem_private_key(key, f)) {
 		fprintf(stderr, "Error writing private key!\n");
-		ecdsa_free(key);
-		fclose(f);
-		return false;
+		goto error;
 	}
 
 	fclose(f);
 
 	if(name)
-		xasprintf(&pubname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+		snprintf(fname, sizeof fname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
 	else
-		xasprintf(&pubname, "%s" SLASH "ed25519_key.pub", confbase);
+		snprintf(fname, sizeof fname, "%s" SLASH "ed25519_key.pub", confbase);
 
-	f = ask_and_open(pubname, "public Ed25519 key", "a", ask, 0666);
-	free(pubname);
+	f = ask_and_open(fname, "public Ed25519 key", "a", ask, 0666);
 
 	if(!f)
 		return false;
@@ -421,6 +423,12 @@ static bool ed25519_keygen(bool ask) {
 	ecdsa_free(key);
 
 	return true;
+
+error:
+	if(f)
+		fclose(f);
+	ecdsa_free(key);
+	return false;
 }
 
 #ifndef DISABLE_LEGACY
@@ -431,7 +439,7 @@ static bool ed25519_keygen(bool ask) {
 static bool rsa_keygen(int bits, bool ask) {
 	rsa_t *key;
 	FILE *f;
-	char *pubname, *privname;
+	char fname[PATH_MAX];
 
 	// Make sure the key size is a multiple of 8 bits.
 	bits &= ~0x7;
@@ -450,44 +458,44 @@ static bool rsa_keygen(int bits, bool ask) {
 	} else
 		fprintf(stderr, "Done.\n");
 
-	xasprintf(&privname, "%s" SLASH "rsa_key.priv", confbase);
-	f = ask_and_open(privname, "private RSA key", "a", ask, 0600);
-	free(privname);
+	snprintf(fname, sizeof fname, "%s" SLASH "rsa_key.priv", confbase);
+	f = ask_and_open(fname, "private RSA key", "a", ask, 0600);
 
 	if(!f)
-		return false;
+		goto error;
 
 	if(!rsa_write_pem_private_key(key, f)) {
 		fprintf(stderr, "Error writing private key!\n");
-		fclose(f);
-		rsa_free(key);
-		return false;
+		goto error;
 	}
 
 	fclose(f);
 
 	if(name)
-		xasprintf(&pubname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+		snprintf(fname, sizeof fname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
 	else
-		xasprintf(&pubname, "%s" SLASH "rsa_key.pub", confbase);
+		snprintf(fname, sizeof fname, "%s" SLASH "rsa_key.pub", confbase);
 
-	f = ask_and_open(pubname, "public RSA key", "a", ask, 0666);
-	free(pubname);
+	f = ask_and_open(fname, "public RSA key", "a", ask, 0666);
 
 	if(!f)
-		return false;
+		goto error;
 
 	if(!rsa_write_pem_public_key(key, f)) {
 		fprintf(stderr, "Error writing public key!\n");
-		fclose(f);
-		rsa_free(key);
-		return false;
+		goto error;
 	}
 
 	fclose(f);
 	rsa_free(key);
 
 	return true;
+
+error:
+	if(f)
+		fclose(f);
+	rsa_free(key);
+	return false;
 }
 #endif
 
@@ -852,6 +860,13 @@ static int cmd_start(int argc, char *argv[]) {
 	}
 	return status;
 #else
+	int pfd[2] = {-1, -1};
+	if(socketpair(AF_UNIX, SOCK_STREAM, 0, pfd)) {
+		fprintf(stderr, "Could not create umbilical socket: %s\n", strerror(errno));
+		free(nargv);
+		return 1;
+	}
+
 	pid_t pid = fork();
 	if(pid == -1) {
 		fprintf(stderr, "Could not fork: %s\n", strerror(errno));
@@ -859,8 +874,15 @@ static int cmd_start(int argc, char *argv[]) {
 		return 1;
 	}
 
-	if(!pid)
+	if(!pid) {
+		close(pfd[0]);
+		char buf[100] = "";
+		snprintf(buf, sizeof buf, "%d", pfd[1]);
+		setenv("TINC_UMBILICAL", buf, true);
 		exit(execvp(c, nargv));
+	} else {
+		close(pfd[1]);
+	}
 
 	free(nargv);
 
@@ -868,12 +890,33 @@ static int cmd_start(int argc, char *argv[]) {
 #ifdef SIGINT
 	signal(SIGINT, SIG_IGN);
 #endif
+
+	// Pass all log messages from the umbilical to stderr.
+	// A nul-byte right before closure means tincd started succesfully.
+	bool failure = true;
+	char buf[1024];
+	ssize_t len;
+
+	while((len = read(pfd[0], buf, sizeof buf)) > 0) {
+		failure = buf[len - 1];
+		if(!failure)
+			len--;
+		write(2, buf, len);
+	}
+
+	if(len)
+		failure = true;
+
+	close(pfd[0]);
+
+	// Make sure the child process is really gone.
 	result = waitpid(pid, &status, 0);
+
 #ifdef SIGINT
 	signal(SIGINT, SIG_DFL);
 #endif
 
-	if(result != pid || !WIFEXITED(status) || WEXITSTATUS(status)) {
+	if(failure || result != pid || !WIFEXITED(status) || WEXITSTATUS(status)) {
 		fprintf(stderr, "Error starting %s\n", c);
 		return 1;
 	}
@@ -1597,11 +1640,11 @@ static int cmd_config(int argc, char *argv[]) {
 	}
 
 	// Open the right configuration file.
-	char *filename;
+	char filename[PATH_MAX];
 	if(node)
-		xasprintf(&filename, "%s" SLASH "%s", hosts_dir, node);
+		snprintf(filename, sizeof filename, "%s" SLASH "%s", hosts_dir, node);
 	else
-		filename = tinc_conf;
+		snprintf(filename, sizeof filename, "%s", tinc_conf);
 
 	FILE *f = fopen(filename, "r");
 	if(!f) {
@@ -1609,11 +1652,11 @@ static int cmd_config(int argc, char *argv[]) {
 		return 1;
 	}
 
-	char *tmpfile = NULL;
+	char tmpfile[PATH_MAX];
 	FILE *tf = NULL;
 
 	if(action >= -1) {
-		xasprintf(&tmpfile, "%s.config.tmp", filename);
+		snprintf(tmpfile, sizeof tmpfile, "%s.config.tmp", filename);
 		tf = fopen(tmpfile, "w");
 		if(!tf) {
 			fprintf(stderr, "Could not open temporary file %s: %s\n", tmpfile, strerror(errno));
@@ -1762,7 +1805,7 @@ static int cmd_config(int argc, char *argv[]) {
 }
 
 static bool try_bind(int port) {
-	struct addrinfo *ai = NULL;
+	struct addrinfo *ai = NULL, *aip;
 	struct addrinfo hint = {
 		.ai_flags = AI_PASSIVE,
 		.ai_family = AF_UNSPEC,
@@ -1770,24 +1813,30 @@ static bool try_bind(int port) {
 		.ai_protocol = IPPROTO_TCP,
 	};
 
+	bool success = true;
 	char portstr[16];
 	snprintf(portstr, sizeof portstr, "%d", port);
 
 	if(getaddrinfo(NULL, portstr, &hint, &ai) || !ai)
 		return false;
 
-	while(ai) {
+	for(aip = ai; aip; aip = aip->ai_next) {
 		int fd = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
-		if(!fd)
-			return false;
+		if(!fd) {
+			success = false;
+			break;
+		}
+
 		int result = bind(fd, ai->ai_addr, ai->ai_addrlen);
 		closesocket(fd);
-		if(result)
-			return false;
-		ai = ai->ai_next;
+		if(result) {
+			success = false;
+			break;
+		}
 	}
 
-	return true;
+	freeaddrinfo(ai);
+	return success;
 }
 
 int check_port(char *name) {
@@ -1799,11 +1848,11 @@ int check_port(char *name) {
 	for(int i = 0; i < 100; i++) {
 		int port = 0x1000 + (rand() & 0x7fff);
 		if(try_bind(port)) {
-			char *filename;
-			xasprintf(&filename, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+			char filename[PATH_MAX];
+			snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", confbase, name);
 			FILE *f = fopen(filename, "a");
-			free(filename);
 			if(!f) {
+				fprintf(stderr, "Could not open %s: %s\n", filename, strerror(errno));
 				fprintf(stderr, "Please change tinc's Port manually.\n");
 				return 0;
 			}
@@ -1894,8 +1943,8 @@ static int cmd_init(int argc, char *argv[]) {
 	check_port(name);
 
 #ifndef HAVE_MINGW
-	char *filename;
-	xasprintf(&filename, "%s" SLASH "tinc-up", confbase);
+	char filename[PATH_MAX];
+	snprintf(filename, sizeof filename, "%s" SLASH "tinc-up", confbase);
 	if(access(filename, F_OK)) {
 		FILE *f = fopenmask(filename, "w", 0777);
 		if(!f) {
@@ -2005,12 +2054,12 @@ static int cmd_edit(int argc, char *argv[]) {
 		return 1;
 	}
 
-	char *filename = NULL;
+	char filename[PATH_MAX] = "";
 
 	if(strncmp(argv[1], "hosts" SLASH, 6)) {
 		for(int i = 0; conffiles[i]; i++) {
 			if(!strcmp(argv[1], conffiles[i])) {
-				xasprintf(&filename, "%s" SLASH "%s", confbase, argv[1]);
+				snprintf(filename, sizeof filename, "%s" SLASH "%s", confbase, argv[1]);
 				break;
 			}
 		}
@@ -2018,8 +2067,8 @@ static int cmd_edit(int argc, char *argv[]) {
 		argv[1] += 6;
 	}
 
-	if(!filename) {
-		xasprintf(&filename, "%s" SLASH "%s", hosts_dir, argv[1]);
+	if(!*filename) {
+		snprintf(filename, sizeof filename, "%s" SLASH "%s", hosts_dir, argv[1]);
 		char *dash = strchr(argv[1], '-');
 		if(dash) {
 			*dash++ = 0;
@@ -2037,6 +2086,7 @@ static int cmd_edit(int argc, char *argv[]) {
 	xasprintf(&command, "edit \"%s\"", filename);
 #endif
 	int result = system(command);
+	free(command);
 	if(result)
 		return result;
 
@@ -2048,8 +2098,8 @@ static int cmd_edit(int argc, char *argv[]) {
 }
 
 static int export(const char *name, FILE *out) {
-	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 *in = fopen(filename, "r");
 	if(!in) {
 		fprintf(stderr, "Could not open configuration file %s: %s\n", filename, strerror(errno));
@@ -2136,7 +2186,7 @@ static int cmd_import(int argc, char *argv[]) {
 
 	char buf[4096];
 	char name[4096];
-	char *filename = NULL;
+	char filename[PATH_MAX] = "";
 	int count = 0;
 	bool firstline = true;
 
@@ -2152,8 +2202,7 @@ static int cmd_import(int argc, char *argv[]) {
 			if(out)
 				fclose(out);
 
-			free(filename);
-			xasprintf(&filename, "%s" SLASH "%s", hosts_dir, name);
+			snprintf(filename, sizeof filename, "%s" SLASH "%s", hosts_dir, name);
 
 			if(!force && !access(filename, F_OK)) {
 				fprintf(stderr, "Host configuration file %s already exists, skipping.\n", filename);
@@ -2259,11 +2308,10 @@ static int cmd_network(int argc, char *argv[]) {
 			continue;
 		}
 
-		char *fname;
-		xasprintf(&fname, "%s/%s/tinc.conf", confdir, ent->d_name);
+		char fname[PATH_MAX];
+		snprintf(fname, sizeof fname, "%s/%s/tinc.conf", confdir, ent->d_name);
 		if(!access(fname, R_OK))
 			printf("%s\n", ent->d_name);
-		free(fname);
 	}
 
 	closedir(dir);
@@ -2558,7 +2606,7 @@ int main(int argc, char *argv[]) {
 	if(!parse_options(argc, argv))
 		return 1;
 
-	make_names();
+	make_names(false);
 	xasprintf(&tinc_conf, "%s" SLASH "tinc.conf", confbase);
 	xasprintf(&hosts_dir, "%s" SLASH "hosts", confbase);