X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=7e08629e76fed5da76ec6ac93950588793149be4;hb=b1f8c65a2cfa307d9b8ed8cc3c8d4819f605e4f6;hp=3944fa2e96f516136e043fb13cadd9752a567996;hpb=50ad3f2a895c38f8d546f87490ca96ab7d9e011e;p=tinc

diff --git a/src/tincctl.c b/src/tincctl.c
index 3944fa2e..7e08629e 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -89,6 +89,10 @@ static void usage(bool status) {
 				"    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"
+				"  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"));
 	}
@@ -331,13 +335,13 @@ static void make_names(void) {
 static int fullread(int fd, void *data, size_t datalen) {
 	int rv, len = 0;
 
-	while (len < datalen) {
+	while(len < datalen) {
 		rv = read(fd, data + len, datalen - len);
 		if(rv == -1 && errno == EINTR)
 			continue;
-		else if (rv == -1)
+		else if(rv == -1)
 			return rv;
-		else if (rv == 0) {
+		else if(rv == 0) {
 			errno = ENODATA;
 			return -1;
 		}
@@ -382,7 +386,7 @@ static int send_ctl_request(int fd, enum request_type type,
 	}
 
 	if(req.length > sizeof req) {
-		if (indata_p == NULL) {
+		if(indata_p == NULL) {
 			errno = EINVAL;
 			return -1;
 		}
@@ -546,6 +550,62 @@ int main(int argc, char *argv[], char *envp[]) {
 		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;
+	}
+
+	if(!strcasecmp(argv[optind], "debug")) {
+		int debuglevel;
+
+		if(argc != optind + 2) {
+			fprintf(stderr, "Invalid arguments.\n");
+			return 1;
+		}
+		debuglevel = atoi(argv[optind+1]);
+		return send_ctl_request_cooked(fd, REQ_SET_DEBUG, &debuglevel,
+									   sizeof(debuglevel)) != -1;
+	}
+
+	if(!strcasecmp(argv[optind], "retry")) {
+		return send_ctl_request_cooked(fd, REQ_RETRY, NULL, 0) != -1;
+	}
+
+	if(!strcasecmp(argv[optind], "reload")) {
+		return send_ctl_request_cooked(fd, REQ_RELOAD, NULL, 0) != -1;
+	}
+
 	fprintf(stderr, _("Unknown command `%s'.\n"), argv[optind]);
 	usage(true);