X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=0337129f8b7f25881f057c3a49a92084369954fa;hb=a444ec396456a25546a4ab3d185c7fb5e4bb7ae3;hp=a7f6185f0716b93164763854b43f8c5c774cffae;hpb=2696ad2cca73aee13e38f740d5530dc33e4a92e6;p=tinc

diff --git a/src/tincctl.c b/src/tincctl.c
index a7f6185f..0337129f 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -1,6 +1,6 @@
 /*
     tincctl.c -- Controlling a running tincd
-    Copyright (C) 2007-2011 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2007-2012 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
@@ -73,6 +73,7 @@ static void usage(bool status) {
 				"      --version           Output version information and exit.\n"
 				"\n"
 				"Valid commands are:\n"
+				"  init [name]                Create initial configuration files.\n"
 				"  start                      Start tincd.\n"
 				"  stop                       Stop tincd.\n"
 				"  restart                    Restart tincd.\n"
@@ -94,7 +95,8 @@ static void usage(bool status) {
 #ifdef HAVE_CURSES
 				"  top                        Show real-time statistics\n"
 #endif
-				"  pcap                       Dump traffic in pcap format\n"
+				"  pcap [snaplen]             Dump traffic in pcap format [up to snaplen bytes per packet]\n"
+				"  log [level]                Dump log output [up to the specified level]\n"
 				"\n");
 		printf("Report bugs to tinc@tinc-vpn.org.\n");
 	}
@@ -138,10 +140,16 @@ static bool parse_options(int argc, char **argv) {
 		}
 	}
 
+	if(!netname) {
+		netname = getenv("NETNAME");
+		if(netname)
+			netname = xstrdup(netname);
+	}
+
 	return true;
 }
 
-FILE *ask_and_open(const char *filename, const char *what, const char *mode) {
+static FILE *ask_and_open(const char *filename, const char *what, const char *mode) {
 	FILE *r;
 	char *directory;
 	char buf[PATH_MAX];
@@ -384,7 +392,7 @@ bool recvline(int fd, char *line, size_t len) {
 	return true;
 }
 
-bool recvdata(int fd, char *data, size_t len) {
+static bool recvdata(int fd, char *data, size_t len) {
 	while(blen < len) {
 		int result = recv(fd, buffer + blen, sizeof buffer - blen, 0);
 		if(result == -1 && errno == EINTR)
@@ -430,8 +438,8 @@ bool sendline(int fd, char *format, ...) {
 	return true;	
 }
 
-void pcap(int fd, FILE *out) {
-	sendline(fd, "%d %d", CONTROL, REQ_PCAP);
+static void pcap(int fd, FILE *out, int snaplen) {
+	sendline(fd, "%d %d %d", CONTROL, REQ_PCAP, snaplen);
 	char data[9018];
 
 	struct {
@@ -446,7 +454,7 @@ void pcap(int fd, FILE *out) {
 		0xa1b2c3d4,
 		2, 4,
 		0, 0,
-		sizeof data,
+		snaplen ?: sizeof data,
 		1,
 	};
 
@@ -481,6 +489,24 @@ void pcap(int fd, FILE *out) {
 	}
 }
 
+static void logcontrol(int fd, FILE *out, int level) {
+	sendline(fd, "%d %d %d", CONTROL, REQ_LOG, level);
+	char data[1024];
+	char line[32];
+
+	while(recvline(fd, line, sizeof line)) {
+		int code, req, len;
+		int n = sscanf(line, "%d %d %d", &code, &req, &len);
+		if(n != 3 || code != CONTROL || req != REQ_LOG || len < 0 || len > sizeof data)
+			break;
+		if(!recvdata(fd, data, len))
+			break;
+		fwrite(data, len, 1, out);
+		fputc('\n', out);
+		fflush(out);
+	}
+}
+
 #ifdef HAVE_MINGW
 static bool remove_service(void) {
 	SC_HANDLE manager = NULL;
@@ -516,7 +542,7 @@ static bool remove_service(void) {
 }
 #endif
 
-int main(int argc, char *argv[], char *envp[]) {
+int main(int argc, char *argv[]) {
 	int fd;
 	int result;
 	char host[128];
@@ -533,7 +559,7 @@ int main(int argc, char *argv[], char *envp[]) {
 	if(show_version) {
 		printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
 			   VERSION, __DATE__, __TIME__, PROT_MAJOR, PROT_MINOR);
-		printf("Copyright (C) 1998-2009 Ivo Timmermans, Guus Sliepen and others.\n"
+		printf("Copyright (C) 1998-2012 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"
@@ -556,7 +582,7 @@ int main(int argc, char *argv[], char *envp[]) {
 	// First handle commands that don't involve connecting to a running tinc daemon.
 
 	if(!strcasecmp(argv[optind], "generate-rsa-keys")) {
-		return !rsa_keygen(optind > argc ? atoi(argv[optind + 1]) : 2048);
+		return !rsa_keygen(optind < argc - 1 ? atoi(argv[optind + 1]) : 2048);
 	}
 
 	if(!strcasecmp(argv[optind], "generate-ecdsa-keys")) {
@@ -564,16 +590,110 @@ int main(int argc, char *argv[], char *envp[]) {
 	}
 
 	if(!strcasecmp(argv[optind], "generate-keys")) {
-		return !(rsa_keygen(optind > argc ? atoi(argv[optind + 1]) : 2048) && ecdsa_keygen());
+		return !(rsa_keygen(optind < argc - 1 ? atoi(argv[optind + 1]) : 2048) && ecdsa_keygen());
 	}
 
 	if(!strcasecmp(argv[optind], "start")) {
-		argv[optind] = NULL;
-		execve(SBINDIR "/tincd", argv, envp);
-		fprintf(stderr, "Could not start tincd: %s", strerror(errno));
+		int i, j;
+		char *c;
+		char *slash = strrchr(argv[0], '/');
+#ifdef HAVE_MINGW
+		if ((c = strrchr(argv[0], '\\')) > slash)
+			slash = c;
+#endif
+		if (slash++) {
+			c = xmalloc((slash - argv[0]) + sizeof("tincd"));
+			sprintf(c, "%.*stincd", (int)(slash - argv[0]), argv[0]);
+		}
+		else
+			c = "tincd";
+		argv[0] = c;
+		for(i = j = 1; argv[i]; ++i)
+			if (i != optind && strcmp(argv[i], "--") != 0)
+				argv[j++] = argv[i];
+		argv[j] = NULL;
+		execvp(c, argv);
+		fprintf(stderr, "Could not start %s: %s\n", c, strerror(errno));
 		return 1;
 	}
 
+	if(!strcasecmp(argv[optind], "init")) {
+		char *filename = NULL;
+		xasprintf(&filename, "%s/tinc.conf", confbase);
+		if(!access(confbase, F_OK)) {
+			fprintf(stderr, "Configuration file %s already exists!\n", filename);
+			return 1;
+		}
+
+		if(optind >= argc - 1) {
+			if(isatty(0) && isatty(1)) {
+				char buf[1024];
+				fprintf(stdout, "Enter the Name you want your tinc node to have: ");
+				fflush(stdout);
+				if(!fgets(buf, sizeof buf, stdin)) {
+					fprintf(stderr, "Error while reading stdin: %s\n", strerror(errno));
+					return 1;
+				}
+				int len = strlen(buf);
+				if(len)
+					buf[--len] = 0;
+				if(!len) {
+					fprintf(stderr, "No name given!\n");
+					return 1;
+				}
+				name = strdup(buf);
+			} else {
+				fprintf(stderr, "No Name given!\n");
+				return 1;
+			}
+		} else {
+			name = strdup(argv[optind + 1]);
+			if(!*name) {
+				fprintf(stderr, "No Name given!\n");
+				return 1;
+			}
+		}
+
+		for(int i = 0; i < strlen(name); i++) {
+			if(!isalnum(name[i]) && name[i] != '_') {
+				fprintf(stderr, "Invalid Name! Only a-z, A-Z, 0-9 and _ are allowed characters.\n");
+				return 1;
+			}
+		}
+
+		if(mkdir(CONFDIR, 0755) && errno != EEXIST) {
+			fprintf(stderr, "Could not create directory %s: %s\n", CONFDIR, strerror(errno));
+			return 1;
+		}
+
+		if(mkdir(confbase, 0755) && errno != EEXIST) {
+			fprintf(stderr, "Could not create directory %s: %s\n", confbase, strerror(errno));
+			return 1;
+		}
+
+		char *filename2 = NULL;
+		xasprintf(&filename2, "%s/hosts", confbase);
+		if(mkdir(filename2, 0755) && errno != EEXIST) {
+			fprintf(stderr, "Could not create directory %s: %s\n", filename, strerror(errno));
+			return 1;
+		}
+
+		FILE *f = fopen(filename, "w");
+		if(!f) {
+			fprintf(stderr, "Could not create file %s: %s\n", filename, strerror(errno));
+			return 1;
+		}
+
+		fprintf(f, "Name = %s\n", name);
+		fclose(f);
+
+		fclose(stdin);
+		if(!rsa_keygen(2048) || !ecdsa_keygen())
+			return false;
+
+		return true;
+	}
+
 	/*
 	 * Now handle commands that do involve connecting to a running tinc daemon.
 	 * Authenticate the server by ensuring the parent directory can be
@@ -819,7 +939,12 @@ int main(int argc, char *argv[], char *envp[]) {
 #endif
 
 	if(!strcasecmp(argv[optind], "pcap")) {
-		pcap(fd, stdout);
+		pcap(fd, stdout, optind < argc - 1 ? atoi(argv[optind + 1]) : 0);
+		return 0;
+	}
+
+	if(!strcasecmp(argv[optind], "log")) {
+		logcontrol(fd, stdout, optind < argc - 1 ? atoi(argv[optind + 1]) : -1);
 		return 0;
 	}