X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=abaf6ee8b8d9c1ad2408a2416adbae53aa1d861e;hb=db465434e2736f6e052e5c52d3613ad81b4bde10;hp=f4379b7f8ebbe6dce5de0cdb42f5321e47d4599b;hpb=f704304823df0ac868786ac89355eda38592dc3f;p=tinc

diff --git a/src/tincctl.c b/src/tincctl.c
index f4379b7f..abaf6ee8 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -75,6 +75,7 @@ char *scriptextension = "";
 static char *prompt;
 
 static struct option const long_options[] = {
+	{"batch", no_argument, NULL, 'b'},
 	{"config", required_argument, NULL, 'c'},
 	{"net", required_argument, NULL, 'n'},
 	{"help", no_argument, NULL, 1},
@@ -86,8 +87,8 @@ 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-2012 Ivo Timmermans, Guus Sliepen and others.\n"
+		   VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
+	printf("Copyright (C) 1998-2014 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"
@@ -100,6 +101,7 @@ static void usage(bool status) {
 	} else {
 		printf("Usage: %s [options] command\n\n", program_name);
 		printf("Valid options are:\n"
+				"  -b, --batch             Don't ask for anything (non-interactive mode).\n"
 				"  -c, --config=DIR        Read configuration options from DIR.\n"
 				"  -n, --net=NETNAME       Connect to net NETNAME.\n"
 				"      --pidfile=FILENAME  Read control cookie from FILENAME.\n"
@@ -158,6 +160,10 @@ static bool parse_options(int argc, char **argv) {
 			case 0:   /* long option */
 				break;
 
+			case 'b':
+				tty = false;
+				break;
+
 			case 'c': /* config file */
 				confbase = xstrdup(optarg);
 				confbasegiven = true;
@@ -757,7 +763,7 @@ bool connect_tincd(bool verbose) {
 
 #ifdef SO_NOSIGPIPE
 	static const int one = 1;
-	setsockopt(c, SOL_SOCKET, SO_NOSIGPIPE, (void *)&one, sizeof one);
+	setsockopt(fd, SOL_SOCKET, SO_NOSIGPIPE, (void *)&one, sizeof one);
 #endif
 
 	char data[4096];
@@ -996,6 +1002,7 @@ static int cmd_dump(int argc, char *argv[]) {
 			break;
 
 		char node[4096];
+		char id[4096];
 		char from[4096];
 		char to[4096];
 		char subnet[4096];
@@ -1013,8 +1020,8 @@ static int cmd_dump(int argc, char *argv[]) {
 
 		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_int, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu, &last_state_change);
-				if(n != 16) {
+				int n = sscanf(line, "%*d %*d %s %s %s port %s %d %d %d %d %x %x %s %s %d %hd %hd %hd %ld", node, id, host, port, &cipher, &digest, &maclength, &compression, &options, &status_int, nexthop, via, &distance, &pmtu, &minmtu, &maxmtu, &last_state_change);
+				if(n != 17) {
 					fprintf(stderr, "Unable to parse node dump from tincd: %s\n", line);
 					return 1;
 				}
@@ -1037,8 +1044,8 @@ static int cmd_dump(int argc, char *argv[]) {
 				} 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);
+					printf("%s id %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, id, host, port, cipher, digest, maclength, compression, options, status_int, nexthop, via, distance, pmtu, minmtu, maxmtu);
 				}
 			} break;
 
@@ -1299,7 +1306,7 @@ char *get_my_name(bool verbose) {
 			continue;
 		if(*value) {
 			fclose(f);
-			return strdup(value);
+			return replace_name(value);
 		}
 	}
 
@@ -1316,9 +1323,11 @@ const var_t variables[] = {
 	{"BindToAddress", VAR_SERVER | VAR_MULTIPLE},
 	{"BindToInterface", VAR_SERVER},
 	{"Broadcast", VAR_SERVER | VAR_SAFE},
+	{"BroadcastSubnet", VAR_SERVER | VAR_MULTIPLE | VAR_SAFE},
 	{"ConnectTo", VAR_SERVER | VAR_MULTIPLE | VAR_SAFE},
 	{"DecrementTTL", VAR_SERVER},
 	{"Device", VAR_SERVER},
+	{"DeviceStandby", VAR_SERVER},
 	{"DeviceType", VAR_SERVER},
 	{"DirectOnly", VAR_SERVER},
 	{"Ed25519PrivateKeyFile", VAR_SERVER},
@@ -1629,9 +1638,12 @@ static int cmd_config(int argc, char *argv[]) {
 	}
 
 	if(action < -1) {
-		if(!found)
+		if(found) {
+			return 0;
+		} else {
 			fprintf(stderr, "No matching configuration variables found.\n");
-		return 1;
+			return 1;
+		}
 	}
 
 	// Make sure we wrote everything...
@@ -1666,18 +1678,6 @@ static int cmd_config(int argc, char *argv[]) {
 	return 0;
 }
 
-bool check_id(const char *name) {
-	if(!name || !*name)
-		return false;
-
-	for(int i = 0; i < strlen(name); i++) {
-		if(!isalnum(name[i]) && name[i] != '_')
-			return false;
-	}
-
-	return true;
-}
-
 static bool try_bind(int port) {
 	struct addrinfo *ai = NULL;
 	struct addrinfo hint = {
@@ -2439,6 +2439,7 @@ int main(int argc, char *argv[]) {
 	program_name = argv[0];
 	orig_argv = argv;
 	orig_argc = argc;
+	tty = isatty(0) && isatty(1);
 
 	if(!parse_options(argc, argv))
 		return 1;
@@ -2469,8 +2470,6 @@ int main(int argc, char *argv[]) {
 	srand(time(NULL));
 	crypto_init();
 
-	tty = isatty(0) && isatty(1);
-
 	if(optind >= argc)
 		return cmd_shell(argc, argv);