X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=a8930fe1d9d8d678f457f4afa85d7fa133616b2e;hb=9b9230a0a79c670b86f54fadd2807b864ff9d91f;hp=2de89e81200728ecc0bc5008c760ad9b0268ac2d;hpb=717ea66d7ba0c23f27d86b3d5c6992b751135455;p=tinc

diff --git a/src/tincctl.c b/src/tincctl.c
index 2de89e81..a8930fe1 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -1,6 +1,6 @@
 /*
     tincctl.c -- Controlling a running tincd
-    Copyright (C) 2007-2012 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2007-2013 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
@@ -31,6 +31,7 @@
 #include "control_common.h"
 #include "ecdsagen.h"
 #include "info.h"
+#include "names.h"
 #include "rsagen.h"
 #include "utils.h"
 #include "tincctl.h"
@@ -40,10 +41,6 @@
 #define mkdir(a, b) mkdir(a)
 #endif
 
-
-/* The name this program was run with. */
-static char *program_name = NULL;
-
 static char **orig_argv;
 static int orig_argc;
 
@@ -54,14 +51,10 @@ static bool show_help = false;
 static bool show_version = false;
 
 static char *name = NULL;
-static char *identname = NULL;          /* program name for syslog */
-static char *pidfilename = NULL;        /* pid file location */
-static char *confdir = NULL;
-static char controlcookie[1024];
-char *netname = NULL;
-char *confbase = NULL;
+static char controlcookie[1025];
 static char *tinc_conf = NULL;
 static char *hosts_dir = NULL;
+struct timeval now;
 
 // Horrible global variables...
 static int pid = 0;
@@ -106,10 +99,9 @@ static void version(void) {
 }
 
 static void usage(bool status) {
-	if(status)
-		fprintf(stderr, "Try `%s --help\' for more information.\n",
-				program_name);
-	else {
+	if(status) {
+		fprintf(stderr, "Try `%s --help\' for more information.\n", program_name);
+	} else {
 		printf("Usage: %s [options] command\n\n", program_name);
 		printf("Valid options are:\n"
 				"  -c, --config=DIR        Read configuration options from DIR.\n"
@@ -120,11 +112,10 @@ static void usage(bool status) {
 				"\n"
 				"Valid commands are:\n"
 				"  init [name]                Create initial configuration files.\n"
-				"  config                     Change configuration:\n"
-				"    [get] VARIABLE           - print current value of VARIABLE\n"
-				"    [set] VARIABLE VALUE     - set VARIABLE to VALUE\n"
-				"    add VARIABLE VALUE       - add VARIABLE with the given VALUE\n"
-				"    del VARIABLE [VALUE]     - remove VARIABLE [only ones with watching VALUE]\n"
+				"  get VARIABLE               Print current value of VARIABLE\n"
+				"  set VARIABLE VALUE         Set VARIABLE to VALUE\n"
+				"  add VARIABLE VALUE         Add VARIABLE with the given VALUE\n"
+				"  del VARIABLE [VALUE]       Remove VARIABLE [only ones with watching VALUE]\n"
 				"  start [tincd options]      Start tincd.\n"
 				"  stop                       Stop tincd.\n"
 				"  restart                    Restart tincd.\n"
@@ -134,7 +125,7 @@ static void usage(bool status) {
 				"  generate-rsa-keys [bits]   Generate a new RSA public/private keypair.\n"
 				"  generate-ecdsa-keys        Generate a new ECDSA public/private keypair.\n"
 				"  dump                       Dump a list of one of the following things:\n"
-				"    nodes                    - all known nodes in the VPN\n"
+				"    [reachable] nodes        - all known nodes in the VPN\n"
 				"    edges                    - all known connections in the VPN\n"
 				"    subnets                  - all known subnets in the VPN\n"
 				"    connections              - all meta connections with ourself\n"
@@ -152,6 +143,8 @@ static void usage(bool status) {
 				"  export                     Export host configuration of local node to standard output\n"
 				"  export-all                 Export all host configuration files to standard output\n"
 				"  import [--force]           Import host configuration file(s) from standard input\n"
+				"  exchange [--force]         Same as export followed by import\n"
+				"  exchange-all [--force]     Same as export-all followed by import\n"
 				"\n");
 		printf("Report bugs to tinc@tinc-vpn.org.\n");
 	}
@@ -353,13 +346,13 @@ static FILE *ask_and_open(const char *filename, const char *what, const char *mo
   them in.
 */
 static bool ecdsa_keygen(bool ask) {
-	ecdsa_t key;
+	ecdsa_t *key;
 	FILE *f;
 	char *pubname, *privname;
 
 	fprintf(stderr, "Generating ECDSA keypair:\n");
 
-	if(!ecdsa_generate(&key)) {
+	if(!(key = ecdsa_generate())) {
 		fprintf(stderr, "Error during key generation!\n");
 		return false;
 	} else
@@ -377,7 +370,12 @@ static bool ecdsa_keygen(bool ask) {
 	fchmod(fileno(f), 0600);
 #endif
 
-	ecdsa_write_pem_private_key(&key, f);
+	if(!ecdsa_write_pem_private_key(key, f)) {
+		fprintf(stderr, "Error writing private key!\n");
+		ecdsa_free(key);
+		fclose(f);
+		return false;
+	}
 
 	fclose(f);
 
@@ -392,11 +390,12 @@ static bool ecdsa_keygen(bool ask) {
 	if(!f)
 		return false;
 
-	char *pubkey = ecdsa_get_base64_public_key(&key);
+	char *pubkey = ecdsa_get_base64_public_key(key);
 	fprintf(f, "ECDSAPublicKey = %s\n", pubkey);
 	free(pubkey);
 
 	fclose(f);
+	ecdsa_free(key);
 
 	return true;
 }
@@ -406,13 +405,13 @@ static bool ecdsa_keygen(bool ask) {
   them in.
 */
 static bool rsa_keygen(int bits, bool ask) {
-	rsa_t key;
+	rsa_t *key;
 	FILE *f;
 	char *pubname, *privname;
 
 	fprintf(stderr, "Generating %d bits keys:\n", bits);
 
-	if(!rsa_generate(&key, bits, 0x10001)) {
+	if(!(key = rsa_generate(bits, 0x10001))) {
 		fprintf(stderr, "Error during key generation!\n");
 		return false;
 	} else
@@ -430,7 +429,12 @@ static bool rsa_keygen(int bits, bool ask) {
 	fchmod(fileno(f), 0600);
 #endif
 
-	rsa_write_pem_private_key(&key, f);
+	if(!rsa_write_pem_private_key(key, f)) {
+		fprintf(stderr, "Error writing private key!\n");
+		fclose(f);
+		rsa_free(key);
+		return false;
+	}
 
 	fclose(f);
 
@@ -445,69 +449,19 @@ static bool rsa_keygen(int bits, bool ask) {
 	if(!f)
 		return false;
 
-	rsa_write_pem_public_key(&key, f);
+	if(!rsa_write_pem_public_key(key, f)) {
+		fprintf(stderr, "Error writing public key!\n");
+		fclose(f);
+		rsa_free(key);
+		return false;
+	}
 
 	fclose(f);
+	rsa_free(key);
 
 	return true;
 }
 
-/*
-  Set all files and paths according to netname
-*/
-static void make_names(void) {
-#ifdef HAVE_MINGW
-	HKEY key;
-	char installdir[1024] = "";
-	long len = sizeof installdir;
-#endif
-
-	if(netname)
-		xasprintf(&identname, "tinc.%s", netname);
-	else
-		identname = xstrdup("tinc");
-
-#ifdef HAVE_MINGW
-	if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\tinc", 0, KEY_READ, &key)) {
-		if(!RegQueryValueEx(key, NULL, 0, 0, installdir, &len)) {
-			if(!confbase) {
-				if(netname)
-					xasprintf(&confbase, "%s" SLASH "%s", installdir, netname);
-				else
-					xasprintf(&confbase, "%s", installdir);
-			}
-		}
-		if(!pidfilename)
-			xasprintf(&pidfilename, "%s" SLASH "pid", confbase);
-		RegCloseKey(key);
-	}
-
-	if(!*installdir) {
-#endif
-	confdir = xstrdup(CONFDIR);
-
-	if(!pidfilename)
-		xasprintf(&pidfilename, "%s" SLASH "run" SLASH "%s.pid", LOCALSTATEDIR, identname);
-
-	if(netname) {
-		if(!confbase)
-			xasprintf(&confbase, CONFDIR SLASH "tinc" SLASH "%s", netname);
-		else
-			fprintf(stderr, "Both netname and configuration directory given, using the latter...\n");
-	} else {
-		if(!confbase)
-			xasprintf(&confbase, CONFDIR SLASH "tinc");
-	}
-
-#ifdef HAVE_MINGW
-	} else
-		confdir = xstrdup(installdir);
-#endif
-
-	xasprintf(&tinc_conf, "%s" SLASH "tinc.conf", confbase);
-	xasprintf(&hosts_dir, "%s" SLASH "hosts", confbase);
-}
-
 static char buffer[4096];
 static size_t blen = 0;
 
@@ -708,8 +662,8 @@ static bool connect_tincd(bool verbose) {
 		return false;
 	}
 
-	char host[128];
-	char port[128];
+	char host[129];
+	char port[129];
 
 	if(fscanf(f, "%20d %1024s %128s port %128s", &pid, controlcookie, host, port) != 4) {
 		if(verbose)
@@ -728,6 +682,26 @@ static bool connect_tincd(bool verbose) {
 	}
 #endif
 
+#ifndef HAVE_MINGW
+	struct sockaddr_un sa;
+	sa.sun_family = AF_UNIX;
+	strncpy(sa.sun_path, unixsocketname, sizeof sa.sun_path);
+
+	fd = socket(AF_UNIX, SOCK_STREAM, 0);
+	if(fd < 0) {
+		if(verbose)
+			fprintf(stderr, "Cannot create UNIX socket: %s\n", sockstrerror(sockerrno));
+		return false;
+	}
+
+	if(connect(fd, (struct sockaddr *)&sa, sizeof sa) < 0) {
+		if(verbose)
+			fprintf(stderr, "Cannot connect to UNIX socket %s: %s\n", unixsocketname, sockstrerror(sockerrno));
+		close(fd);
+		fd = -1;
+		return false;
+	}
+#else
 	struct addrinfo hints = {
 		.ai_family = AF_UNSPEC,
 		.ai_socktype = SOCK_STREAM,
@@ -768,6 +742,7 @@ static bool connect_tincd(bool verbose) {
 	}
 
 	freeaddrinfo(res);
+#endif
 
 	char data[4096];
 	int version;
@@ -853,6 +828,11 @@ static int cmd_start(int argc, char *argv[]) {
 }
 
 static int cmd_stop(int argc, char *argv[]) {
+	if(argc > 1) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
 #ifndef HAVE_MINGW
 	if(!connect_tincd(true)) {
 		if(pid) {
@@ -870,16 +850,10 @@ static int cmd_stop(int argc, char *argv[]) {
 	}
 
 	sendline(fd, "%d %d", CONTROL, REQ_STOP);
-	if(!recvline(fd, line, sizeof line) || sscanf(line, "%d %d %d", &code, &req, &result) != 3 || code != CONTROL || req != REQ_STOP || result) {
-		fprintf(stderr, "Could not stop tinc daemon.\n");
-		return 1;
-	}
 
-	// Wait for tincd to close the connection...
-	fd_set r;
-	FD_ZERO(&r);
-	FD_SET(fd, &r);
-	select(fd + 1, &r, NULL, NULL, NULL);
+	while(recvline(fd, line, sizeof line)) {
+		// Wait for tincd to close the connection...
+	}
 #else
 	if(!remove_service())
 		return 1;
@@ -897,6 +871,11 @@ static int cmd_restart(int argc, char *argv[]) {
 }
 
 static int cmd_reload(int argc, char *argv[]) {
+	if(argc > 1) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
 	if(!connect_tincd(true))
 		return 1;
 
@@ -911,6 +890,19 @@ static int cmd_reload(int argc, char *argv[]) {
 }
 
 static int cmd_dump(int argc, char *argv[]) {
+	bool only_reachable = false;
+
+	if(argc > 2 && !strcasecmp(argv[1], "reachable")) {
+		if(strcasecmp(argv[2], "nodes")) {
+			fprintf(stderr, "`reachable' only supported for nodes.\n");
+			usage(true);
+			return 1;
+		}
+		only_reachable = true;
+		argv++;
+		argc--;
+	}
+
 	if(argc != 2) {
 		fprintf(stderr, "Invalid number of arguments.\n");
 		usage(true);
@@ -985,8 +977,10 @@ static int cmd_dump(int argc, char *argv[]) {
 					fprintf(stderr, "Unable to parse node dump from tincd: %s\n", line);
 					return 1;
 				}
+
+				memcpy(&status, &status_int, sizeof status);
+
 				if(do_graph) {
-					memcpy(&status, &status_int, sizeof status);
 					const char *color = "black";
 					if(!strcmp(host, "MYSELF"))
 						color = "green";
@@ -1000,6 +994,8 @@ static int cmd_dump(int argc, char *argv[]) {
 						color = "green";
 					printf(" %s [label = \"%s\", color = \"%s\"%s];\n", node, node, color, strcmp(host, "MYSELF") ? "" : ", style = \"filled\"");
 				} else {
+					if(only_reachable && !status.reachable)
+						continue;
 					printf("%s at %s port %s cipher %d digest %d maclength %d compression %d options %x status %04x nexthop %s via %s distance %d pmtu %hd (min %hd max %hd)\n",
 							node, host, port, cipher, digest, maclength, compression, options, status_int, nexthop, via, distance, pmtu, minmtu, maxmtu);
 				}
@@ -1052,6 +1048,11 @@ static int cmd_dump(int argc, char *argv[]) {
 }
 
 static int cmd_purge(int argc, char *argv[]) {
+	if(argc > 1) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
 	if(!connect_tincd(true))
 		return 1;
 
@@ -1087,6 +1088,11 @@ static int cmd_debug(int argc, char *argv[]) {
 }
 
 static int cmd_retry(int argc, char *argv[]) {
+	if(argc > 1) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
 	if(!connect_tincd(true))
 		return 1;
 
@@ -1146,6 +1152,11 @@ static int cmd_disconnect(int argc, char *argv[]) {
 }
 
 static int cmd_top(int argc, char *argv[]) {
+	if(argc > 1) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
 #ifdef HAVE_CURSES
 	if(!connect_tincd(true))
 		return 1;
@@ -1153,12 +1164,17 @@ static int cmd_top(int argc, char *argv[]) {
 	top(fd);
 	return 0;
 #else
-	fprintf(stderr, "This version of tincctl was compiled without support for the curses library.\n");
+	fprintf(stderr, "This version of tinc was compiled without support for the curses library.\n");
 	return 1;
 #endif
 }
 
 static int cmd_pcap(int argc, char *argv[]) {
+	if(argc > 2) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
 	if(!connect_tincd(true))
 		return 1;
 
@@ -1167,6 +1183,11 @@ static int cmd_pcap(int argc, char *argv[]) {
 }
 
 static int cmd_log(int argc, char *argv[]) {
+	if(argc > 2) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
 	if(!connect_tincd(true))
 		return 1;
 
@@ -1175,6 +1196,11 @@ static int cmd_log(int argc, char *argv[]) {
 }
 
 static int cmd_pid(int argc, char *argv[]) {
+	if(argc > 1) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
 	if(!connect_tincd(true) && !pid)
 		return 1;
 
@@ -1189,10 +1215,11 @@ static int rstrip(char *value) {
 	return len;
 }
 
-static char *get_my_name() {
+static char *get_my_name(bool verbose) {
 	FILE *f = fopen(tinc_conf, "r");
 	if(!f) {
-		fprintf(stderr, "Could not open %s: %s\n", tinc_conf, strerror(errno));
+		if(verbose)
+			fprintf(stderr, "Could not open %s: %s\n", tinc_conf, strerror(errno));
 		return NULL;
 	}
 
@@ -1218,7 +1245,8 @@ static char *get_my_name() {
 	}
 
 	fclose(f);
-	fprintf(stderr, "Could not find Name in %s.\n", tinc_conf);
+	if(verbose)
+		fprintf(stderr, "Could not find Name in %s.\n", tinc_conf);
 	return NULL;
 }
 
@@ -1299,6 +1327,9 @@ static int cmd_config(int argc, char *argv[]) {
 		return 1;
 	}
 
+	if(strcasecmp(argv[0], "config"))
+		argv--, argc++;
+
 	int action = -2;
 	if(!strcasecmp(argv[1], "get")) {
 		argv++, argc--;
@@ -1392,7 +1423,7 @@ static int cmd_config(int argc, char *argv[]) {
 		/* Should this go into our own host config file? */
 
 		if(!node && !(variables[i].type & VAR_SERVER)) {
-			node = get_my_name();
+			node = get_my_name(true);
 			if(!node)
 				return 1;
 		}
@@ -1423,19 +1454,8 @@ static int cmd_config(int argc, char *argv[]) {
 
 	FILE *f = fopen(filename, "r");
 	if(!f) {
-		if(action < 0 || errno != ENOENT) {
-			fprintf(stderr, "Could not open configuration file %s: %s\n", filename, strerror(errno));
-			return 1;
-		}
-
-		// If it doesn't exist, create it.
-		f = fopen(filename, "a+");
-		if(!f) {
-			fprintf(stderr, "Could not create configuration file %s: %s\n", filename, strerror(errno));
-			return 1;
-		} else {
-			fprintf(stderr, "Created configuration file %s.\n", filename);
-		}
+		fprintf(stderr, "Could not open configuration file %s: %s\n", filename, strerror(errno));
+		return 1;
 	}
 
 	char *tmpfile = NULL;
@@ -1595,7 +1615,10 @@ static int cmd_init(int argc, char *argv[]) {
 		return 1;
 	}
 
-	if(argc < 2) {
+	if(argc > 2) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	} else if(argc < 2) {
 		if(tty) {
 			char buf[1024];
 			fprintf(stdout, "Enter the Name you want your tinc node to have: ");
@@ -1674,14 +1697,38 @@ static int cmd_init(int argc, char *argv[]) {
 }
 
 static int cmd_generate_keys(int argc, char *argv[]) {
+	if(argc > 2) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
+	if(!name)
+		name = get_my_name(false);
+
 	return !(rsa_keygen(argc > 1 ? atoi(argv[1]) : 2048, true) && ecdsa_keygen(true));
 }
 
 static int cmd_generate_rsa_keys(int argc, char *argv[]) {
+	if(argc > 2) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
+	if(!name)
+		name = get_my_name(false);
+
 	return !rsa_keygen(argc > 1 ? atoi(argv[1]) : 2048, true);
 }
 
 static int cmd_generate_ecdsa_keys(int argc, char *argv[]) {
+	if(argc > 1) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
+	if(!name)
+		name = get_my_name(false);
+
 	return !ecdsa_keygen(true);
 }
 
@@ -1691,6 +1738,11 @@ static int cmd_help(int argc, char *argv[]) {
 }
 
 static int cmd_version(int argc, char *argv[]) {
+	if(argc > 1) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
 	version();
 	return 0;
 }
@@ -1793,14 +1845,29 @@ static int export(const char *name, FILE *out) {
 }
 
 static int cmd_export(int argc, char *argv[]) {
-	char *name = get_my_name();
+	if(argc > 1) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
+	char *name = get_my_name(true);
 	if(!name)
 		return 1;
 
-	return export(name, stdout);
+	int result = export(name, stdout);
+	if(!tty)
+		fclose(stdout);
+
+	free(name);
+	return result;
 }
 
 static int cmd_export_all(int argc, char *argv[]) {
+	if(argc > 1) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
 	DIR *dir = opendir(hosts_dir);
 	if(!dir) {
 		fprintf(stderr, "Could not open host configuration directory %s: %s\n", hosts_dir, strerror(errno));
@@ -1824,21 +1891,30 @@ static int cmd_export_all(int argc, char *argv[]) {
 	}
 
 	closedir(dir);
+	if(!tty)
+		fclose(stdout);
 	return result;
 }
 
 static int cmd_import(int argc, char *argv[]) {
+	if(argc > 1) {
+		fprintf(stderr, "Too many arguments!\n");
+		return 1;
+	}
+
 	FILE *in = stdin;
 	FILE *out = NULL;
 
 	char buf[4096];
 	char name[4096];
-	char *filename;
+	char *filename = NULL;
 	int count = 0;
 	bool firstline = true;
 
 	while(fgets(buf, sizeof buf, in)) {
 		if(sscanf(buf, "Name = %s", name) == 1) {
+			firstline = false;
+
 			if(!check_id(name)) {
 				fprintf(stderr, "Invalid Name in input!\n");
 				return 1;
@@ -1863,7 +1939,6 @@ static int cmd_import(int argc, char *argv[]) {
 			}
 
 			count++;
-			firstline = false;
 			continue;
 		} else if(firstline) {
 			fprintf(stderr, "Junk at the beginning of the input, ignoring.\n");
@@ -1894,9 +1969,18 @@ static int cmd_import(int argc, char *argv[]) {
 	}
 }
 
+static int cmd_exchange(int argc, char *argv[]) {
+	return cmd_export(argc, argv) ?: cmd_import(argc, argv);
+}
+
+static int cmd_exchange_all(int argc, char *argv[]) {
+	return cmd_export_all(argc, argv) ?: cmd_import(argc, argv);
+}
+
 static const struct {
 	const char *command;
 	int (*function)(int argc, char *argv[]);
+	bool hidden;
 } commands[] = {
 	{"start", cmd_start},
 	{"stop", cmd_stop},
@@ -1912,7 +1996,11 @@ static const struct {
 	{"pcap", cmd_pcap},
 	{"log", cmd_log},
 	{"pid", cmd_pid},
-	{"config", cmd_config},
+	{"config", cmd_config, true},
+	{"add", cmd_config},
+	{"del", cmd_config},
+	{"get", cmd_config},
+	{"set", cmd_config},
 	{"init", cmd_init},
 	{"generate-keys", cmd_generate_keys},
 	{"generate-rsa-keys", cmd_generate_rsa_keys},
@@ -1924,6 +2012,8 @@ static const struct {
 	{"export", cmd_export},
 	{"export-all", cmd_export_all},
 	{"import", cmd_import},
+	{"exchange", cmd_exchange},
+	{"exchange-all", cmd_exchange_all},
 	{NULL, NULL},
 };
 
@@ -1937,7 +2027,7 @@ static char *complete_command(const char *text, int state) {
 		i++;
 
 	while(commands[i].command) {
-		if(!strncasecmp(commands[i].command, text, strlen(text)))
+		if(!commands[i].hidden && !strncasecmp(commands[i].command, text, strlen(text)))
 			return xstrdup(commands[i].command);
 		i++;
 	}
@@ -1946,7 +2036,7 @@ static char *complete_command(const char *text, int state) {
 }
 
 static char *complete_dump(const char *text, int state) {
-	const char *matches[] = {"nodes", "edges", "subnets", "connections", "graph", NULL};
+	const char *matches[] = {"reachable", "nodes", "edges", "subnets", "connections", "graph", NULL};
 	static int i;
 
 	if(!state)
@@ -1964,42 +2054,24 @@ static char *complete_dump(const char *text, int state) {
 }
 
 static char *complete_config(const char *text, int state) {
-	const char *sub[] = {"get", "set", "add", "del"};
 	static int i;
-	if(!state) {
+
+	if(!state)
 		i = 0;
-		if(!strchr(rl_line_buffer + 7, ' '))
-			i = -4;
-		else {
-			bool found = false;
-			for(int i = 0; i < 4; i++) {
-				if(!strncasecmp(rl_line_buffer + 7, sub[i], strlen(sub[i])) && rl_line_buffer[7 + strlen(sub[i])] == ' ') {
-					found = true;
-					break;
-				}
-			}
-			if(!found)
-				return NULL;
-		}
-	} else {
+	else
 		i++;
-	}
 
-	while(i < 0 || variables[i].name) {
-		if(i < 0 && !strncasecmp(sub[i + 4], text, strlen(text)))
-			return xstrdup(sub[i + 4]);
-		if(i >= 0) {
-			char *dot = strchr(text, '.');
-			if(dot) {
-				if((variables[i].type & VAR_HOST) && !strncasecmp(variables[i].name, dot + 1, strlen(dot + 1))) {
-					char *match;
-					xasprintf(&match, "%.*s.%s", dot - text, text, variables[i].name);
-					return match;
-				}
-			} else {
-				if(!strncasecmp(variables[i].name, text, strlen(text)))
-					return xstrdup(variables[i].name);
+	while(variables[i].name) {
+		char *dot = strchr(text, '.');
+		if(dot) {
+			if((variables[i].type & VAR_HOST) && !strncasecmp(variables[i].name, dot + 1, strlen(dot + 1))) {
+				char *match;
+				xasprintf(&match, "%.*s.%s", dot - text, text, variables[i].name);
+				return match;
 			}
+		} else {
+			if(!strncasecmp(variables[i].name, text, strlen(text)))
+				return xstrdup(variables[i].name);
 		}
 		i++;
 	}
@@ -2052,7 +2124,13 @@ static char **completion (const char *text, int start, int end) {
 		matches = rl_completion_matches(text, complete_command);
 	else if(!strncasecmp(rl_line_buffer, "dump ", 5))
 		matches = rl_completion_matches(text, complete_dump);
-	else if(!strncasecmp(rl_line_buffer, "config ", 7))
+	else if(!strncasecmp(rl_line_buffer, "add ", 4))
+		matches = rl_completion_matches(text, complete_config);
+	else if(!strncasecmp(rl_line_buffer, "del ", 4))
+		matches = rl_completion_matches(text, complete_config);
+	else if(!strncasecmp(rl_line_buffer, "get ", 4))
+		matches = rl_completion_matches(text, complete_config);
+	else if(!strncasecmp(rl_line_buffer, "set ", 4))
 		matches = rl_completion_matches(text, complete_config);
 	else if(!strncasecmp(rl_line_buffer, "info ", 5))
 		matches = rl_completion_matches(text, complete_info);
@@ -2171,6 +2249,8 @@ int main(int argc, char *argv[]) {
 		return 1;
 
 	make_names();
+	xasprintf(&tinc_conf, "%s" SLASH "tinc.conf", confbase);
+	xasprintf(&hosts_dir, "%s" SLASH "hosts", confbase);
 
 	if(show_version) {
 		version();