X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=18fc05ac1aa66ac87ae7e97c0c77de3004374a1d;hb=bfce56d473e1e01a8af0260262ca84f09154e71f;hp=5f2b135103f2b761313aabe3f1c66c5228617d8e;hpb=f0e7e6b03e34e69cac5b01a2d943ad3b9b59d36c;p=tinc

diff --git a/src/tincctl.c b/src/tincctl.c
index 5f2b1351..18fc05ac 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -246,7 +246,7 @@ static void disable_old_keys(const char *filename, const char *what) {
 
 	while(fgets(buf, sizeof buf, r)) {
 		if(!block && !strncmp(buf, "-----BEGIN ", 11)) {
-			if((strstr(buf, " RSA ") && strstr(what, "RSA"))) {
+			if((strstr(buf, " ED25519 ") && strstr(what, "Ed25519")) || (strstr(buf, " RSA ") && strstr(what, "RSA"))) {
 				disabled = true;
 				block = true;
 			}
@@ -485,7 +485,7 @@ bool recvline(int fd, char *line, size_t len) {
 
 	while(!(newline = memchr(buffer, '\n', blen))) {
 		int result = recv(fd, buffer + blen, sizeof buffer - blen, 0);
-		if(result == -1 && errno == EINTR)
+		if(result == -1 && sockerrno == EINTR)
 			continue;
 		else if(result <= 0)
 			return false;
@@ -511,7 +511,7 @@ 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)
+		if(result == -1 && sockerrno == EINTR)
 			continue;
 		else if(result <= 0)
 			return false;
@@ -543,7 +543,7 @@ bool sendline(int fd, char *format, ...) {
 
 	while(blen) {
 		int result = send(fd, p, blen, MSG_NOSIGNAL);
-		if(result == -1 && errno == EINTR)
+		if(result == -1 && sockerrno == EINTR)
 			continue;
 		else if(result <= 0)
 			return false;
@@ -723,7 +723,7 @@ bool connect_tincd(bool verbose) {
 
 	if(getaddrinfo(host, port, &hints, &res) || !res) {
 		if(verbose)
-			fprintf(stderr, "Cannot resolve %s port %s: %s", host, port, strerror(errno));
+			fprintf(stderr, "Cannot resolve %s port %s: %s", host, port, sockstrerror(sockerrno));
 		return false;
 	}
 
@@ -985,6 +985,8 @@ static int cmd_dump(int argc, char *argv[]) {
 		char subnet[4096];
 		char host[4096];
 		char port[4096];
+		char local_host[4096];
+		char local_port[4096];
 		char via[4096];
 		char nexthop[4096];
 		int cipher, digest, maclength, compression, distance, socket, weight;
@@ -1025,8 +1027,8 @@ static int cmd_dump(int argc, char *argv[]) {
 			} break;
 
 			case REQ_DUMP_EDGES: {
-				int n = sscanf(line, "%*d %*d %s %s %s port %s %x %d", from, to, host, port, &options, &weight);
-				if(n != 6) {
+				int n = sscanf(line, "%*d %*d %s %s %s port %s %s port %s %x %d", from, to, host, port, local_host, local_port, &options, &weight);
+				if(n != 8) {
 					fprintf(stderr, "Unable to parse edge dump from tincd.\n");
 					return 1;
 				}
@@ -1038,7 +1040,7 @@ static int cmd_dump(int argc, char *argv[]) {
 					else if(do_graph == 2)
 						printf(" %s -> %s [w = %f, weight = %f];\n", node1, node2, w, w);
 				} else {
-					printf("%s to %s at %s port %s options %x weight %d\n", from, to, host, port, options, weight);
+					printf("%s to %s at %s port %s local %s port %s options %x weight %d\n", from, to, host, port, local_host, local_port, options, weight);
 				}
 			} break;
 
@@ -1613,7 +1615,7 @@ static int cmd_config(int argc, char *argv[]) {
 	if(action < -1) {
 		if(!found)
 			fprintf(stderr, "No matching configuration variables found.\n");
-		return 0;
+		return 1;
 	}
 
 	// Make sure we wrote everything...
@@ -1626,7 +1628,7 @@ static int cmd_config(int argc, char *argv[]) {
 	if(action < 0 && !removed) {
 		remove(tmpfile);
 		fprintf(stderr, "No configuration variables deleted.\n");
-		return *value != 0;
+		return 1;
 	}
 
 	// Replace the configuration file with the new one