From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sun, 15 Jul 2012 23:14:08 +0000 (+0200)
Subject: Strip default subnet weight from output.
X-Git-Tag: release-1.1pre3~104
X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=6319dc9dde3b328ba800f25a6bb4cf303d27f664;p=tinc

Strip default subnet weight from output.
---

diff --git a/src/info.c b/src/info.c
index f354f96f..6d0435f8 100644
--- a/src/info.c
+++ b/src/info.c
@@ -33,6 +33,13 @@ void logger(int level, int priority, const char *format, ...) {
         va_end(ap);
 }
 
+static char *strip_weight(char *netstr) {
+	int len = strlen(netstr);
+	if(len >= 3 && !strcmp(netstr + len - 3, "#10"))
+		netstr[len - 3] = 0;
+	return netstr;
+}
+
 static int info_node(int fd, const char *item) {
 	// Check the list of nodes
 	sendline(fd, "%d %d %s", CONTROL, REQ_DUMP_NODES, item);
@@ -154,7 +161,7 @@ static int info_node(int fd, const char *item) {
 			return 1;
 		}
 		if(!strcmp(from, item))
-			printf(" %s", subnet);
+			printf(" %s", strip_weight(subnet));
 	}
 	printf("\n");
 
@@ -224,7 +231,7 @@ static int info_subnet(int fd, const char *item) {
 		}
 
 		found = true;
-		printf("Subnet: %s\n", netstr);
+		printf("Subnet: %s\n", strip_weight(netstr));
 		printf("Owner:  %s\n", owner);
 	}