X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=4f06daa63bce5d6e6506f761f3b2070ecbcb867d;hb=84570275acd84628586a6ca591a283d074ca10f0;hp=00a296dc73a1184fd8b915ecefae01253b075d42;hpb=80b81c00b129b006981b76bdb734df3296317d6f;p=tinc

diff --git a/src/tincctl.c b/src/tincctl.c
index 00a296dc..4f06daa6 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -76,7 +76,7 @@ static void usage(bool status) {
 				"  start                      Start tincd.\n"
 				"  stop                       Stop tincd.\n"
 				"  restart                    Restart tincd.\n"
-				"  reload                     Reload configuration of running tincd.\n"
+				"  reload                     Partially reload configuration of running tincd.\n"
 				"  pid                        Show PID of currently running tincd.\n"
 				"  generate-keys [bits]       Generate new RSA and ECDSA public/private keypairs.\n"
 				"  generate-rsa-keys [bits]   Generate a new RSA public/private keypair.\n"
@@ -90,7 +90,6 @@ static void usage(bool status) {
 				"  purge                      Purge unreachable nodes\n"
 				"  debug N                    Set debug level\n"
 				"  retry                      Retry all outgoing connections\n"
-				"  reload                     Partial reload of configuration\n"
 				"  disconnect NODE            Close meta connection with NODE\n"
 #ifdef HAVE_CURSES
 				"  top                        Show real-time statistics\n"
@@ -405,14 +404,14 @@ bool recvdata(int fd, char *data, size_t len) {
 bool sendline(int fd, char *format, ...) {
 	static char buffer[4096];
 	char *p = buffer;
-	size_t blen = 0;
+	int blen = 0;
 	va_list ap;
 
 	va_start(ap, format);
 	blen = vsnprintf(buffer, sizeof buffer, format, ap);
 	va_end(ap);
 
-	if(blen < 0 || blen >= sizeof buffer)
+	if(blen < 1 || blen >= sizeof buffer)
 		return false;
 
 	buffer[blen] = '\n';
@@ -422,7 +421,7 @@ bool sendline(int fd, char *format, ...) {
 		int result = send(fd, p, blen, 0);
 		if(result == -1 && errno == EINTR)
 			continue;
-		else if(result <= 0);
+		else if(result <= 0)
 			return false;
 		p += result;
 		blen -= result;
@@ -482,7 +481,42 @@ void pcap(int fd, FILE *out) {
 	}
 }
 
-int main(int argc, char *argv[], char *envp[]) {
+#ifdef HAVE_MINGW
+static bool remove_service(void) {
+	SC_HANDLE manager = NULL;
+	SC_HANDLE service = NULL;
+	SERVICE_STATUS status = {0};
+
+	manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
+	if(!manager) {
+		fprintf(stderr, "Could not open service manager: %s\n", winerror(GetLastError()));
+		return false;
+	}
+
+	service = OpenService(manager, identname, SERVICE_ALL_ACCESS);
+
+	if(!service) {
+		fprintf(stderr, "Could not open %s service: %s\n", identname, winerror(GetLastError()));
+		return false;
+	}
+
+	if(!ControlService(service, SERVICE_CONTROL_STOP, &status))
+		fprintf(stderr, "Could not stop %s service: %s\n", identname, winerror(GetLastError()));
+	else
+		fprintf(stderr, "%s service stopped\n", identname);
+
+	if(!DeleteService(service)) {
+		fprintf(stderr, "Could not remove %s service: %s\n", identname, winerror(GetLastError()));
+		return false;
+	}
+
+	fprintf(stderr, "%s service removed\n", identname);
+
+	return true;
+}
+#endif
+
+int main(int argc, char *argv[]) {
 	int fd;
 	int result;
 	char host[128];
@@ -497,8 +531,8 @@ int main(int argc, char *argv[], char *envp[]) {
 	make_names();
 
 	if(show_version) {
-		printf("%s version %s (built %s %s, protocol %d)\n", PACKAGE,
-			   VERSION, __DATE__, __TIME__, PROT_CURRENT);
+		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"
 				"See the AUTHORS file for a complete list.\n\n"
 				"tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
@@ -534,9 +568,26 @@ int main(int argc, char *argv[], char *envp[]) {
 	}
 
 	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;
 	}
 
@@ -574,7 +625,7 @@ int main(int argc, char *argv[], char *envp[]) {
 	struct addrinfo *res = NULL;
 
 	if(getaddrinfo(host, port, &hints, &res) || !res) {
-		fprintf(stderr, "Cannot resolve %s port %s: %s", host ?: "localhost", port, strerror(errno));
+		fprintf(stderr, "Cannot resolve %s port %s: %s", host, port, strerror(errno));
 		return 1;
 	}
 
@@ -593,7 +644,7 @@ int main(int argc, char *argv[], char *envp[]) {
 #endif
 
 	if(connect(fd, res->ai_addr, res->ai_addrlen) < 0) {
-		fprintf(stderr, "Cannot connect to %s port %s: %s\n", host ?: "localhost", port, sockstrerror(sockerrno));
+		fprintf(stderr, "Cannot connect to %s port %s: %s\n", host, port, sockstrerror(sockerrno));
 		return 1;
 	}
 
@@ -622,11 +673,16 @@ int main(int argc, char *argv[], char *envp[]) {
 	}
 
 	if(!strcasecmp(argv[optind], "stop")) {
+#ifndef HAVE_MINGW
 		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;
 		}
+#else
+		if(!remove_service())
+			return 1;
+#endif
 		return 0;
 	}