X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=78e2dc1410e37ddf83b02d9984f438da24a3dda1;hb=d6388d782ede1bbe49a5c2643362e2e0f383fa89;hp=3b0c614feec4dca1a90828c7d6ff4fde98b1e96f;hpb=73348be58ecb9c40cf435122a00e72ac4d1a4c9b;p=tinc

diff --git a/src/tincctl.c b/src/tincctl.c
index 3b0c614f..78e2dc14 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -44,6 +44,9 @@
 /* The name this program was run with. */
 static char *program_name = NULL;
 
+static char **orig_argv;
+static int orig_argc;
+
 /* If nonzero, display usage information and exit. */
 static bool show_help = false;
 
@@ -708,33 +711,57 @@ static bool connect_tincd(bool verbose) {
 
 
 static int cmd_start(int argc, char *argv[]) {
-	int i, j;
-	char *c;
+	if(connect_tincd(false)) {
+		if(netname)
+			fprintf(stderr, "A tincd is already running for net `%s' with pid %d.\n", netname, pid);
+		else
+			fprintf(stderr, "A tincd is already running with pid %d.\n", pid);
+		return 0;
+	}
 
-	argc += optind;
-	argv -= optind;
-	char *slash = strrchr(argv[0], '/');
+	char *c;
+	char *slash = strrchr(program_name, '/');
 
 #ifdef HAVE_MINGW
-	if ((c = strrchr(argv[0], '\\')) > slash)
+	if ((c = strrchr(program_name, '\\')) > slash)
 		slash = c;
 #endif
 
 	if (slash++)
-		xasprintf(&c, "%.*stincd", (int)(slash - argv[0]), argv[0]);
+		xasprintf(&c, "%.*stincd", (int)(slash - program_name), program_name);
 	else
 		c = "tincd";
 
-	argv[0] = c;
+	int nargc = 0;
+	char **nargv = xmalloc_and_zero((orig_argc + argc) * sizeof *nargv);
 
-	for(i = j = 1; argv[i]; ++i)
-		if (i != optind && strcmp(argv[i], "--") != 0)
-			argv[j++] = argv[i];
+	for(int i = 0; i < orig_argc; i++)
+		nargv[nargc++] = orig_argv[i];
+	for(int i = 1; i < argc; i++)
+		nargv[nargc++] = argv[i];
 
-	argv[j] = NULL;
-	execvp(c, argv);
-	fprintf(stderr, "Could not start %s: %s\n", c, strerror(errno));
+#ifdef HAVE_MINGW
+	execvp(c, nargv);
+	fprintf(stderr, "Error starting %s: %s\n", c, strerror(errno));
 	return 1;
+#else
+	pid_t pid = fork();
+	if(pid == -1) {
+		fprintf(stderr, "Could not fork: %s\n", strerror(errno));
+		return 1;
+	}
+
+	if(!pid)
+		exit(execvp(c, nargv));
+	
+	int status = -1;
+	if(waitpid(pid, &status, 0) != pid || !WIFEXITED(status) || WEXITSTATUS(status)) {
+		fprintf(stderr, "Error starting %s\n", c);
+		return 1;
+	}
+
+	return 0;
+#endif
 }
 
 static int cmd_stop(int argc, char *argv[]) {
@@ -759,6 +786,10 @@ static int cmd_stop(int argc, char *argv[]) {
 	if(!remove_service())
 		return 1;
 #endif
+	close(fd);
+	pid = 0;
+	fd = -1;
+
 	return 0;
 }
 
@@ -816,7 +847,7 @@ static int cmd_dump(int argc, char *argv[]) {
 
 	while(recvline(fd, line, sizeof line)) {
 		char node1[4096], node2[4096];
-		int n = sscanf(line, "%d %d %s to %s", &code, &req, node1, node2);
+		int n = sscanf(line, "%d %d %s %s", &code, &req, node1, node2);
 		if(n == 2) {
 			if(do_graph && req == REQ_DUMP_NODES)
 				continue;
@@ -829,9 +860,63 @@ static int cmd_dump(int argc, char *argv[]) {
 		if(n < 2)
 			break;
 
-		if(!do_graph)
-			printf("%s\n", line + 5);
-		else {
+		if(!do_graph) {
+			char node[4096];
+			char from[4096];
+			char to[4096];
+			char subnet[4096];
+			char host[4096];
+			char port[4096];
+			char via[4096];
+			char nexthop[4096];
+			int cipher, digest, maclength, compression, distance, socket, weight;
+			short int pmtu, minmtu, maxmtu;
+			unsigned int options, status;
+			long int last_state_change;
+
+			switch(req) {
+				case REQ_DUMP_NODES: {
+					int n = sscanf(line, "%*d %*d %s %s port %s %d %d %d %d %x %x %s %s %d %hd %hd %hd %ld", node, host, port, &cipher, &digest, &maclength, &compression, &options, &status, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu, &last_state_change);
+					if(n != 16) {
+						fprintf(stderr, "Unable to parse node dump from tincd: %s\n", line);
+						return 1;
+					}
+					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, nexthop, via, distance, pmtu, minmtu, maxmtu);
+				} break;
+
+				case REQ_DUMP_EDGES: {
+					int n = sscanf(line, "%*d %*d %s %s %s port %s %x %d", from, to, host, port, &options, &weight);
+					if(n != 6) {
+						fprintf(stderr, "Unable to parse edge dump from tincd.\n");
+						return 1;
+					}
+					printf("%s to %s at %s port %s options %x weight %d\n", from, to, host, port, options, weight);
+				} break;
+
+				case REQ_DUMP_SUBNETS: {
+					int n = sscanf(line, "%*d %*d %s %s", subnet, node);
+					if(n != 2) {
+						fprintf(stderr, "Unable to parse subnet dump from tincd.\n");
+						return 1;
+					}
+					printf("%s owner %s\n", strip_weight(subnet), node);
+				} break;
+
+				case REQ_DUMP_CONNECTIONS: {
+					int n = sscanf(line, "%*d %*d %s %s port %s %x %d %x", node, host, port, &options, &socket, &status);
+					if(n != 6) {
+						fprintf(stderr, "Unable to parse connection dump from tincd.\n");
+						return 1;
+					}
+					printf("%s at %s port %s options %x socket %d status %x\n", node, host, port, options, socket, status);
+				} break;
+
+				default:
+					fprintf(stderr, "Unable to parse dump from tincd.\n");
+					return 1;
+			}
+		} else {
 			if(req == REQ_DUMP_NODES)
 				printf(" %s [label = \"%s\"];\n", node1, node1);
 			else
@@ -897,7 +982,7 @@ static int cmd_connect(int argc, char *argv[]) {
 		return 1;
 	}
 
-	if(!check_id(argv[2])) {
+	if(!check_id(argv[1])) {
 		fprintf(stderr, "Invalid name for node.\n");
 		return 1;
 	}
@@ -920,7 +1005,7 @@ static int cmd_disconnect(int argc, char *argv[]) {
 		return 1;
 	}
 
-	if(!check_id(argv[2])) {
+	if(!check_id(argv[1])) {
 		fprintf(stderr, "Invalid name for node.\n");
 		return 1;
 	}
@@ -1752,6 +1837,88 @@ static char *complete_dump(const char *text, int state) {
 	return NULL;
 }
 
+static char *complete_config(const char *text, int state) {
+	const char *sub[] = {"get", "set", "add", "del"};
+	static int i;
+	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 {
+		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);
+			}
+		}
+		i++;
+	}
+
+	return NULL;
+}
+
+static char *complete_info(const char *text, int state) {
+	static int i;
+	if(!state) {
+		i = 0;
+		if(!connect_tincd(false))
+			return NULL;
+		// Check the list of nodes
+		sendline(fd, "%d %d", CONTROL, REQ_DUMP_NODES);
+		sendline(fd, "%d %d", CONTROL, REQ_DUMP_SUBNETS);
+	}
+
+	while(recvline(fd, line, sizeof line)) {
+		char item[4096];
+		int n = sscanf(line, "%d %d %s", &code, &req, item);
+		if(n == 2) {
+			i++;
+			if(i >= 2)
+				break;
+			else
+				continue;
+		}
+
+		if(n != 3) {
+			fprintf(stderr, "Unable to parse dump from tincd, n = %d, i = %d.\n", n, i);
+			break;
+		}
+
+		if(!strncmp(item, text, strlen(text)))
+			return xstrdup(strip_weight(item));
+	}
+
+	return NULL;
+}
+
+static char *complete_nothing(const char *text, int state) {
+	return NULL;
+}
+
 static char **completion (const char *text, int start, int end) {
 	char **matches = NULL;
 
@@ -1759,6 +1926,10 @@ 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))
+		matches = rl_completion_matches(text, complete_config);
+	else if(!strncasecmp(rl_line_buffer, "info ", 5))
+		matches = rl_completion_matches(text, complete_info);
 
 	return matches;
 }
@@ -1779,6 +1950,7 @@ static int cmd_shell(int argc, char *argv[]) {
 
 #ifdef HAVE_READLINE
 	rl_readline_name = "tinc";
+	rl_completion_entry_function = complete_nothing;
 	rl_attempted_completion_function = completion;
 	rl_filename_completion_desired = 0;
 	char *copy = NULL;
@@ -1789,6 +1961,7 @@ static int cmd_shell(int argc, char *argv[]) {
 		if(tty) {
 			free(copy);
 			free(line);
+			rl_basic_word_break_characters = "\t\n ";
 			line = readline(prompt);
 			if(line)
 				copy = xstrdup(line);
@@ -1797,7 +1970,7 @@ static int cmd_shell(int argc, char *argv[]) {
 		}
 #else
 		if(tty)
-			fputs(stdout, prompt);
+			fputs(prompt, stdout);
 
 		line = fgets(buf, sizeof buf, stdin);
 #endif
@@ -1832,6 +2005,9 @@ static int cmd_shell(int argc, char *argv[]) {
 		if(nargc == argc)
 			continue;
 
+		if(!strcasecmp(nargv[argc], "exit") || !strcasecmp(nargv[argc], "quit"))
+			return result;
+
 		bool found = false;
 
 		for(int i = 0; commands[i].command; i++) {
@@ -1843,7 +2019,7 @@ static int cmd_shell(int argc, char *argv[]) {
 		}
 
 #ifdef HAVE_READLINE
-		if(found)
+		if(tty && found)
 			add_history(copy);
 #endif
 
@@ -1861,6 +2037,8 @@ static int cmd_shell(int argc, char *argv[]) {
 
 int main(int argc, char *argv[]) {
 	program_name = argv[0];
+	orig_argv = argv;
+	orig_argc = argc;
 
 	if(!parse_options(argc, argv))
 		return 1;