X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=784c6a94759abe3e8b3a3c9e1303729f163c450b;hb=c388527e341658dc915dd67c90bbc9b52b8539c0;hp=814800e8969c6c62c7060f26786789ef8fb63671;hpb=551cd19406a560d0d206bff5b4e9da064ec222b6;p=tinc

diff --git a/src/tincctl.c b/src/tincctl.c
index 814800e8..784c6a94 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -1,6 +1,6 @@
 /*
     tincctl.c -- Controlling a running tincd
-    Copyright (C) 2007 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 2007-2009 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
@@ -12,22 +12,20 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
 
-#include <sys/un.h>
 #include <getopt.h>
 
 #include "xalloc.h"
 #include "protocol.h"
 #include "control_common.h"
 #include "rsagen.h"
+#include "utils.h"
 
 /* The name this program was run with. */
 char *program_name = NULL;
@@ -49,6 +47,10 @@ static char *controlsocketname = NULL;			/* pid file location */
 char *netname = NULL;
 char *confbase = NULL;
 
+#ifdef HAVE_MINGW
+static struct WSAData wsa_state;
+#endif
+
 static struct option const long_options[] = {
 	{"config", required_argument, NULL, 'c'},
 	{"net", required_argument, NULL, 'n'},
@@ -60,11 +62,11 @@ static struct option const long_options[] = {
 
 static void usage(bool status) {
 	if(status)
-		fprintf(stderr, _("Try `%s --help\' for more information.\n"),
+		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"
+		printf("Usage: %s [options] command\n\n", program_name);
+		printf("Valid options are:\n"
 				"  -c, --config=DIR              Read configuration options from DIR.\n"
 				"  -n, --net=NETNAME             Connect to net NETNAME.\n"
 				"      --controlsocket=FILENAME  Open control socket at FILENAME.\n"
@@ -88,8 +90,8 @@ static void usage(bool status) {
 				"  debug N                    Set debug level\n"
 				"  retry                      Retry all outgoing connections\n"
 				"  reload                     Partial reload of configuration\n"
-				"\n"));
-		printf(_("Report bugs to tinc@tinc-vpn.org.\n"));
+				"\n");
+		printf("Report bugs to tinc@tinc-vpn.org.\n");
 	}
 }
 
@@ -144,12 +146,12 @@ FILE *ask_and_open(const char *filename, const char *what, const char *mode) {
 	/* Check stdin and stdout */
 	if(isatty(0) && isatty(1)) {
 		/* Ask for a file and/or directory name. */
-		fprintf(stdout, _("Please enter a file to save %s to [%s]: "),
+		fprintf(stdout, "Please enter a file to save %s to [%s]: ",
 				what, filename);
 		fflush(stdout);
 
 		if(fgets(buf, sizeof buf, stdin) < 0) {
-			fprintf(stderr, _("Error while reading stdin: %s\n"),
+			fprintf(stderr, "Error while reading stdin: %s\n",
 					strerror(errno));
 			return NULL;
 		}
@@ -180,7 +182,7 @@ FILE *ask_and_open(const char *filename, const char *what, const char *mode) {
 	r = fopen(filename, mode);
 
 	if(!r) {
-		fprintf(stderr, _("Error opening file `%s': %s\n"), filename, strerror(errno));
+		fprintf(stderr, "Error opening file `%s': %s\n", filename, strerror(errno));
 		return NULL;
 	}
 
@@ -197,16 +199,16 @@ static bool keygen(int bits) {
 	char *name = NULL;
 	char *filename;
 
-	fprintf(stderr, _("Generating %d bits keys:\n"), bits);
+	fprintf(stderr, "Generating %d bits keys:\n", bits);
 
 	if(!rsa_generate(&key, bits, 0x10001)) {
-		fprintf(stderr, _("Error during key generation!\n"));
+		fprintf(stderr, "Error during key generation!\n");
 		return false;
 	} else
-		fprintf(stderr, _("Done.\n"));
+		fprintf(stderr, "Done.\n");
 
-	asprintf(&filename, "%s/rsa_key.priv", confbase);
-	f = ask_and_open(filename, _("private RSA key"), "a");
+	xasprintf(&filename, "%s/rsa_key.priv", confbase);
+	f = ask_and_open(filename, "private RSA key", "a");
 
 	if(!f)
 		return false;
@@ -217,7 +219,7 @@ static bool keygen(int bits) {
 #endif
 		
 	if(ftell(f))
-		fprintf(stderr, _("Appending key to existing contents.\nMake sure only one key is stored in the file.\n"));
+		fprintf(stderr, "Appending key to existing contents.\nMake sure only one key is stored in the file.\n");
 
 	rsa_write_pem_private_key(&key, f);
 
@@ -225,17 +227,17 @@ static bool keygen(int bits) {
 	free(filename);
 
 	if(name)
-		asprintf(&filename, "%s/hosts/%s", confbase, name);
+		xasprintf(&filename, "%s/hosts/%s", confbase, name);
 	else
-		asprintf(&filename, "%s/rsa_key.pub", confbase);
+		xasprintf(&filename, "%s/rsa_key.pub", confbase);
 
-	f = ask_and_open(filename, _("public RSA key"), "a");
+	f = ask_and_open(filename, "public RSA key", "a");
 
 	if(!f)
 		return false;
 
 	if(ftell(f))
-		fprintf(stderr, _("Appending key to existing contents.\nMake sure only one key is stored in the file.\n"));
+		fprintf(stderr, "Appending key to existing contents.\nMake sure only one key is stored in the file.\n");
 
 	rsa_write_pem_public_key(&key, f);
 
@@ -256,20 +258,18 @@ static void make_names(void) {
 #endif
 
 	if(netname)
-		asprintf(&identname, "tinc.%s", 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(!logfilename)
-				asprintf(&logfilename, "%s/log/%s.log", identname);
 			if(!confbase) {
 				if(netname)
-					asprintf(&confbase, "%s/%s", installdir, netname);
+					xasprintf(&confbase, "%s/%s", installdir, netname);
 				else
-					asprintf(&confbase, "%s", installdir);
+					xasprintf(&confbase, "%s", installdir);
 			}
 		}
 		RegCloseKey(key);
@@ -279,16 +279,16 @@ static void make_names(void) {
 #endif
 
 	if(!controlsocketname)
-		asprintf(&controlsocketname, "%s/run/%s.control/socket", LOCALSTATEDIR, identname);
+		xasprintf(&controlsocketname, "%s/run/%s.control/socket", LOCALSTATEDIR, identname);
 
 	if(netname) {
 		if(!confbase)
-			asprintf(&confbase, CONFDIR "/tinc/%s", netname);
+			xasprintf(&confbase, CONFDIR "/tinc/%s", netname);
 		else
-			fprintf(stderr, _("Both netname and configuration directory given, using the latter...\n"));
+			fprintf(stderr, "Both netname and configuration directory given, using the latter...\n");
 	} else {
 		if(!confbase)
-			asprintf(&confbase, CONFDIR "/tinc");
+			xasprintf(&confbase, CONFDIR "/tinc");
 	}
 }
 
@@ -296,13 +296,17 @@ static int fullread(int fd, void *data, size_t datalen) {
 	int rv, len = 0;
 
 	while(len < datalen) {
-		rv = read(fd, data + len, datalen - len);
+		rv = recv(fd, data + len, datalen - len, 0);
 		if(rv == -1 && errno == EINTR)
 			continue;
 		else if(rv == -1)
 			return rv;
 		else if(rv == 0) {
+#ifdef HAVE_MINGW
+			errno = 0;
+#else
 			errno = ENODATA;
+#endif
 			return -1;
 		}
 		len += rv;
@@ -319,23 +323,29 @@ static int send_ctl_request(int fd, enum request_type type,
 						   size_t *indatalen_p) {
 	tinc_ctl_request_t req;
 	int rv;
+	void *indata;
+
+	memset(&req, 0, sizeof req);
+	req.length = sizeof req + outdatalen;
+	req.type = type;
+	req.res_errno = 0;
+
+#ifdef HAVE_MINGW
+	if(send(fd, (void *)&req, sizeof req, 0) != sizeof req || send(fd, outdata, outdatalen, 0) != outdatalen)
+		return -1;
+#else
 	struct iovec vector[2] = {
 		{&req, sizeof req},
 		{(void*) outdata, outdatalen}
 	};
-	void *indata;
 
 	if(res_errno_p == NULL)
 		return -1;
 
-	memset(&req, 0, sizeof req);
-	req.length = sizeof req + outdatalen;
-	req.type = type;
-	req.res_errno = 0;
-
 	while((rv = writev(fd, vector, 2)) == -1 && errno == EINTR) ;
 	if(rv != req.length)
 		return -1;
+#endif
 
 	if(fullread(fd, &req, sizeof req) == -1)
 		return -1;
@@ -371,16 +381,14 @@ static int send_ctl_request(int fd, enum request_type type,
 /*
    Send a request (with printfs)
 */
-static int send_ctl_request_cooked(int fd, enum request_type type,
-								   void const *outdata, size_t outdatalen)
-{
+static int send_ctl_request_cooked(int fd, enum request_type type, void const *outdata, size_t outdatalen) {
 	int res_errno = -1;
 	char *buf = NULL;
 	size_t buflen = 0;
 
 	if(send_ctl_request(fd, type, outdata, outdatalen, &res_errno,
 						(void**) &buf, &buflen)) {
-		fprintf(stderr, _("Error sending request: %s\n"), strerror(errno));
+		fprintf(stderr, "Error sending request: %s\n", strerror(errno));
 		return -1;
 	}
 
@@ -390,7 +398,7 @@ static int send_ctl_request_cooked(int fd, enum request_type type,
 	}
 
 	if(res_errno != 0) {
-		fprintf(stderr, _("Server reported error: %s\n"), strerror(res_errno));
+		fprintf(stderr, "Server reported error: %s\n", strerror(res_errno));
 		return -1;
 	}
 
@@ -398,30 +406,25 @@ static int send_ctl_request_cooked(int fd, enum request_type type,
 }
 
 int main(int argc, char *argv[], char *envp[]) {
-	struct sockaddr_un addr;
 	tinc_ctl_greeting_t greeting;
 	int fd;
 	int result;
 
 	program_name = argv[0];
 
-	setlocale(LC_ALL, "");
-	bindtextdomain(PACKAGE, LOCALEDIR);
-	textdomain(PACKAGE);
-
 	if(!parse_options(argc, argv))
 		return 1;
 	
 	make_names();
 
 	if(show_version) {
-		printf(_("%s version %s (built %s %s, protocol %d)\n"), PACKAGE,
+		printf("%s version %s (built %s %s, protocol %d)\n", PACKAGE,
 			   VERSION, __DATE__, __TIME__, PROT_CURRENT);
-		printf(_("Copyright (C) 1998-2007 Ivo Timmermans, Guus Sliepen and others.\n"
+		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"
 				"and you are welcome to redistribute it under certain conditions;\n"
-				"see the file COPYING for details.\n"));
+				"see the file COPYING for details.\n");
 
 		return 0;
 	}
@@ -432,7 +435,7 @@ int main(int argc, char *argv[], char *envp[]) {
 	}
 
 	if(optind >= argc) {
-		fprintf(stderr, _("Not enough arguments.\n"));
+		fprintf(stderr, "Not enough arguments.\n");
 		usage(true);
 		return 1;
 	}
@@ -440,13 +443,13 @@ 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-keys")) {
-		return !keygen(optind > argc ? atoi(argv[optind + 1]) : 1024);
+		return !keygen(optind > argc ? atoi(argv[optind + 1]) : 2048);
 	}
 
 	if(!strcasecmp(argv[optind], "start")) {
 		argv[optind] = NULL;
 		execve(SBINDIR "/tincd", argv, envp);
-		fprintf(stderr, _("Could not start tincd: %s"), strerror(errno));
+		fprintf(stderr, "Could not start tincd: %s", strerror(errno));
 		return 1;
 	}
 
@@ -457,6 +460,31 @@ int main(int argc, char *argv[], char *envp[]) {
 	 * ancestors are writable only by trusted users, which we don't verify.
 	 */
 
+#ifdef HAVE_MINGW
+	if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) {
+		fprintf(stderr, "System call `%s' failed: %s", "WSAStartup", winerror(GetLastError()));
+		return 1;
+	}
+
+	struct sockaddr_in addr;
+	memset(&addr, 0, sizeof addr);
+	addr.sin_family = AF_INET;
+	addr.sin_addr.s_addr = htonl(0x7f000001);
+	addr.sin_port = htons(55555);
+
+	fd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
+	if(fd < 0) {
+		fprintf(stderr, "Cannot create TCP socket: %s\n", sockstrerror(sockerrno));
+		return 1;
+	}
+
+	unsigned long arg = 0;
+
+	if(ioctlsocket(fd, FIONBIO, &arg) != 0) {
+		fprintf(stderr, "ioctlsocket failed: %s", sockstrerror(sockerrno));
+	}
+#else
+	struct sockaddr_un addr;
 	struct stat statbuf;
 	char *lastslash = strrchr(controlsocketname, '/');
 	if(lastslash != NULL) {
@@ -468,43 +496,45 @@ int main(int argc, char *argv[], char *envp[]) {
 		result = stat(".", &statbuf);
 
 	if(result < 0) {
-		fprintf(stderr, _("Unable to check control socket directory permissions: %s\n"), strerror(errno));
+		fprintf(stderr, "Unable to check control socket directory permissions: %s\n", strerror(errno));
 		return 1;
 	}
 
 	if(statbuf.st_uid != 0 || (statbuf.st_mode & S_IXOTH) != 0 || (statbuf.st_gid != 0 && (statbuf.st_mode & S_IXGRP)) != 0) {
-		fprintf(stderr, _("Insecure permissions on control socket directory\n"));
+		fprintf(stderr, "Insecure permissions on control socket directory\n");
 		return 1;
 	}
 
 	if(strlen(controlsocketname) >= sizeof addr.sun_path) {
-		fprintf(stderr, _("Control socket filename too long!\n"));
+		fprintf(stderr, "Control socket filename too long!\n");
 		return 1;
 	}
 
 	fd = socket(PF_UNIX, SOCK_STREAM, 0);
 	if(fd < 0) {
-		fprintf(stderr, _("Cannot create UNIX socket: %s\n"), strerror(errno));
+		fprintf(stderr, "Cannot create UNIX socket: %s\n", strerror(errno));
 		return 1;
 	}
 
 	memset(&addr, 0, sizeof addr);
 	addr.sun_family = AF_UNIX;
 	strncpy(addr.sun_path, controlsocketname, sizeof addr.sun_path - 1);
+#endif
 
 	if(connect(fd, (struct sockaddr *)&addr, sizeof addr) < 0) {
-		fprintf(stderr, _("Cannot connect to %s: %s\n"), controlsocketname, strerror(errno));
+			
+		fprintf(stderr, "Cannot connect to %s: %s\n", controlsocketname, sockstrerror(sockerrno));
 		return 1;
 	}
 
 	if(fullread(fd, &greeting, sizeof greeting) == -1) {
-		fprintf(stderr, _("Cannot read greeting from control socket: %s\n"),
-				strerror(errno));
+		fprintf(stderr, "Cannot read greeting from control socket: %s\n",
+				sockstrerror(sockerrno));
 		return 1;
 	}
 
 	if(greeting.version != TINC_CTL_VERSION_CURRENT) {
-		fprintf(stderr, _("Version mismatch: server %d, client %d\n"),
+		fprintf(stderr, "Version mismatch: server %d, client %d\n",
 				greeting.version, TINC_CTL_VERSION_CURRENT);
 		return 1;
 	}
@@ -528,7 +558,7 @@ int main(int argc, char *argv[], char *envp[]) {
 
 	if(!strcasecmp(argv[optind], "dump")) {
 		if(argc < optind + 2) {
-			fprintf(stderr, _("Not enough arguments.\n"));
+			fprintf(stderr, "Not enough arguments.\n");
 			usage(true);
 			return 1;
 		}
@@ -553,7 +583,7 @@ int main(int argc, char *argv[], char *envp[]) {
 			return send_ctl_request_cooked(fd, REQ_DUMP_GRAPH, NULL, 0) != -1;
 		}
 
-		fprintf(stderr, _("Unknown dump type '%s'.\n"), argv[optind+1]);
+		fprintf(stderr, "Unknown dump type '%s'.\n", argv[optind+1]);
 		usage(true);
 		return 1;
 	}
@@ -582,7 +612,7 @@ int main(int argc, char *argv[], char *envp[]) {
 		return send_ctl_request_cooked(fd, REQ_RELOAD, NULL, 0) != -1;
 	}
 
-	fprintf(stderr, _("Unknown command `%s'.\n"), argv[optind]);
+	fprintf(stderr, "Unknown command `%s'.\n", argv[optind]);
 	usage(true);
 	
 	close(fd);