X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=56179c6ec19d3576246463c54493b80220cd2c3f;hb=1065879c8c6e8cdf8d3755024241f31eaabd4138;hp=a90f7a28e21065dad87d68e8426b06fb91f53913;hpb=bf8e3ce13dba6109757c14dc0013a315a75d2ba3;p=tinc

diff --git a/src/tincctl.c b/src/tincctl.c
index a90f7a28..56179c6e 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -30,9 +30,9 @@
 
 #include <getopt.h>
 
-#include "conf.h"
-#include "protocol.h"
 #include "xalloc.h"
+#include "protocol.h"
+#include "control_common.h"
 
 /* The name this program was run with. */
 char *program_name = NULL;
@@ -49,12 +49,10 @@ int kill_tincd = 0;
 /* If nonzero, generate public/private keypair for this host/net. */
 int generate_keys = 0;
 
-char *identname = NULL;				/* program name for syslog */
-char *controlsocketname = NULL;			/* pid file location */
-char *confbase = NULL;
+static char *identname = NULL;				/* program name for syslog */
+static char *controlsocketname = NULL;			/* pid file location */
 char *netname = NULL;
-
-static int status;
+char *confbase = NULL;
 
 static struct option const long_options[] = {
 	{"config", required_argument, NULL, 'c'},
@@ -83,13 +81,15 @@ static void usage(bool status) {
 				"  stop                       Stop tincd.\n"
 				"  restart                    Restart tincd.\n"
 				"  reload                     Reload configuration of running tincd.\n"
-				"  genkey [bits]              Generate a new public/private keypair.\n"
+				"  pid                        Show PID of currently running tincd.\n"
+				"  generate-keys [bits]       Generate a new public/private keypair.\n"
 				"  dump                       Dump a list of one of the following things:\n"
 				"    nodes                    - all known nodes in the VPN\n"
 				"    edges                    - all known connections in the VPN\n"
 				"    subnets                  - all known subnets in the VPN\n"
 				"    connections              - all meta connections with ourself\n"
 				"    graph                    - graph of the VPN in dotty format\n"
+				"  purge                      Purge unreachable nodes\n"
 				"\n"));
 		printf(_("Report bugs to tinc@tinc-vpn.org.\n"));
 	}
@@ -136,6 +136,59 @@ static bool parse_options(int argc, char **argv) {
 	return true;
 }
 
+FILE *ask_and_open(const char *filename, const char *what, const char *mode) {
+	FILE *r;
+	char *directory;
+	char buf[PATH_MAX];
+	char buf2[PATH_MAX];
+	size_t len;
+
+	/* 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]: "),
+				what, filename);
+		fflush(stdout);
+
+		if(fgets(buf, sizeof buf, stdin) < 0) {
+			fprintf(stderr, _("Error while reading stdin: %s\n"),
+					strerror(errno));
+			return NULL;
+		}
+
+		len = strlen(buf);
+		if(len)
+			buf[--len] = 0;
+
+		if(len)
+			filename = buf;
+	}
+
+#ifdef HAVE_MINGW
+	if(filename[0] != '\\' && filename[0] != '/' && !strchr(filename, ':')) {
+#else
+	if(filename[0] != '/') {
+#endif
+		/* The directory is a relative path or a filename. */
+		directory = get_current_dir_name();
+		snprintf(buf2, sizeof buf2, "%s/%s", directory, filename);
+		filename = buf2;
+	}
+
+	umask(0077);				/* Disallow everything for group and other */
+
+	/* Open it first to keep the inode busy */
+
+	r = fopen(filename, mode);
+
+	if(!r) {
+		fprintf(stderr, _("Error opening file `%s': %s\n"), filename, strerror(errno));
+		return NULL;
+	}
+
+	return r;
+}
+
 /* This function prettyprints the key generation process */
 
 static void indicator(int a, int b, void *p) {
@@ -276,9 +329,118 @@ static void make_names(void) {
 	}
 }
 
-int main(int argc, char **argv) {
-	int fd;
+static int fullread(int fd, void *data, size_t datalen) {
+	int rv, len = 0;
+
+	while (len < datalen) {
+		rv = read(fd, data + len, datalen - len);
+		if(rv == -1 && errno == EINTR)
+			continue;
+		else if (rv == -1)
+			return rv;
+		else if (rv == 0) {
+			errno = ENODATA;
+			return -1;
+		}
+		len += rv;
+	}
+	return 0;
+}
+
+/*
+   Send a request (raw)
+*/
+static int send_ctl_request(int fd, enum request_type type,
+						   void const *outdata, size_t outdatalen,
+						   int *res_errno_p, void **indata_p,
+						   size_t *indatalen_p) {
+	tinc_ctl_request_t req;
+	int rv;
+	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;
+
+	if(fullread(fd, &req, sizeof req) == -1)
+		return -1;
+
+	if(req.length < sizeof req) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	if(req.length > sizeof req) {
+		if (indata_p == NULL) {
+			errno = EINVAL;
+			return -1;
+		}
+
+		indata = xmalloc(req.length - sizeof req);
+
+		if(fullread(fd, indata, req.length - sizeof req) == -1) {
+			free(indata);
+			return -1;
+		}
+
+		*indata_p = indata;
+		if(indatalen_p != NULL)
+			*indatalen_p = req.length - sizeof req;
+	}
+
+	*res_errno_p = req.res_errno;
+
+	return 0;
+}
+
+/*
+   Send a request (with printfs)
+*/
+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));
+		return -1;
+	}
+
+	if(buf != NULL) {
+		printf("%*s", buflen, buf);
+		free(buf);
+	}
+
+	if(res_errno != 0) {
+		fprintf(stderr, _("Server reported error: %s\n"), strerror(res_errno));
+		return -1;
+	}
+
+	return 0;
+}
+
+int main(int argc, char *argv[], char *envp[]) {
 	struct sockaddr_un addr;
+	int fd;
+	int len;
+	tinc_ctl_greeting_t greeting;
+	tinc_ctl_request_t req;
+
 	program_name = argv[0];
 
 	setlocale(LC_ALL, "");
@@ -307,6 +469,27 @@ int main(int argc, char **argv) {
 		return 0;
 	}
 
+	if(optind >= argc) {
+		fprintf(stderr, _("Not enough arguments.\n"));
+		usage(true);
+		return 1;
+	}
+
+	// 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);
+	}
+
+	if(!strcasecmp(argv[optind], "start")) {
+		argv[optind] = NULL;
+		execve("tincd", argv, envp);
+		fprintf(stderr, _("Could not start tincd: %s"), strerror(errno));
+		return 1;
+	}
+
+	// Now handle commands that do involve connecting to a running tinc daemon.
+
 	if(strlen(controlsocketname) >= sizeof addr.sun_path) {
 		fprintf(stderr, _("Control socket filename too long!\n"));
 		return 1;
@@ -327,8 +510,82 @@ int main(int argc, char **argv) {
 		return 1;
 	}
 
-	printf("Connected to %s.\n", controlsocketname);
+	if(fullread(fd, &greeting, sizeof greeting) == -1) {
+		fprintf(stderr, _("Cannot read greeting from control socket: %s\n"),
+				strerror(errno));
+		return 1;
+	}
+
+	if(greeting.version != TINC_CTL_VERSION_CURRENT) {
+		fprintf(stderr, _("Version mismatch: server %d, client %d\n"),
+				greeting.version, TINC_CTL_VERSION_CURRENT);
+		return 1;
+	}
+
+	struct ucred cred;
+	socklen_t credlen = sizeof cred;
+
+	if(getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &cred, &credlen) < 0) {
+		fprintf(stderr, _("Could not obtain PID: %s\n"), strerror(errno));
+		return 1;
+	}
+
+	if(!strcasecmp(argv[optind], "pid")) {
+		printf("%d\n", cred.pid);
+		return 0;
+	}
+
+	if(!strcasecmp(argv[optind], "stop")) {
+		return send_ctl_request_cooked(fd, REQ_STOP, NULL, 0) != -1;
+	}
+
+	if(!strcasecmp(argv[optind], "reload")) {
+		return send_ctl_request_cooked(fd, REQ_RELOAD, NULL, 0) != -1;
+	}
+	
+	if(!strcasecmp(argv[optind], "restart")) {
+		return send_ctl_request_cooked(fd, REQ_RESTART, NULL, 0) != -1;
+	}
+
+	if(!strcasecmp(argv[optind], "dump")) {
+		if (argc < optind + 2) {
+			fprintf(stderr, _("Not enough arguments.\n"));
+			usage(true);
+			return 1;
+		}
+
+		if(!strcasecmp(argv[optind+1], "nodes")) {
+			return send_ctl_request_cooked(fd, REQ_DUMP_NODES, NULL, 0) != -1;
+		}
+
+		if(!strcasecmp(argv[optind+1], "edges")) {
+			return send_ctl_request_cooked(fd, REQ_DUMP_EDGES, NULL, 0) != -1;
+		}
+
+		if(!strcasecmp(argv[optind+1], "subnets")) {
+			return send_ctl_request_cooked(fd, REQ_DUMP_SUBNETS, NULL, 0) != -1;
+		}
+
+		if(!strcasecmp(argv[optind+1], "connections")) {
+			return send_ctl_request_cooked(fd, REQ_DUMP_CONNECTIONS, NULL, 0) != -1;
+		}
+
+		if(!strcasecmp(argv[optind+1], "graph")) {
+			return send_ctl_request_cooked(fd, REQ_DUMP_GRAPH, NULL, 0) != -1;
+		}
+
+		fprintf(stderr, _("Unknown dump type '%s'.\n"), argv[optind+1]);
+		usage(true);
+		return 1;
+	}
+
+	if(!strcasecmp(argv[optind], "purge")) {
+		return send_ctl_request_cooked(fd, REQ_PURGE, NULL, 0) != -1;
+	}
 
+	fprintf(stderr, _("Unknown command `%s'.\n"), argv[optind]);
+	usage(true);
+	
 	close(fd);
 
 	return 0;