X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Finfo.c;h=c324df9405e0e9e5b070445c2d29802525996918;hb=6debc6c79ba385d35f646e0958f84ace5b8f4b4d;hp=758c0d1f4515533684fdb78d4dcf4f040e793546;hpb=1c475ecb575367a6b3f9328b0f643ad636155341;p=tinc

diff --git a/src/info.c b/src/info.c
index 758c0d1f..c324df94 100644
--- a/src/info.c
+++ b/src/info.c
@@ -20,12 +20,10 @@
 #include "system.h"
 
 #include "control_common.h"
-#include "list.h"
 #include "subnet.h"
 #include "tincctl.h"
 #include "info.h"
 #include "utils.h"
-#include "xalloc.h"
 
 void logger(int level, int priority, const char *format, ...) {
 	(void)level;
@@ -40,7 +38,7 @@ void logger(int level, int priority, const char *format, ...) {
 }
 
 char *strip_weight(char *netstr) {
-	int len = strlen(netstr);
+	size_t len = strlen(netstr);
 
 	if(len >= 3 && !strcmp(netstr + len - 3, "#10")) {
 		netstr[len - 3] = 0;
@@ -299,7 +297,7 @@ static int info_subnet(int fd, const char *item) {
 					continue;
 				}
 
-				if(memcmp(&find.net.ipv4.address, &subnet.net.ipv4.address, sizeof(subnet.net.ipv4))) {
+				if(memcmp(&find.net.ipv4.address, &subnet.net.ipv4.address, sizeof(subnet.net.ipv4.address))) {
 					continue;
 				}
 			}
@@ -313,14 +311,14 @@ static int info_subnet(int fd, const char *item) {
 					continue;
 				}
 
-				if(memcmp(&find.net.ipv6.address, &subnet.net.ipv6.address, sizeof(subnet.net.ipv6))) {
+				if(memcmp(&find.net.ipv6.address, &subnet.net.ipv6.address, sizeof(subnet.net.ipv6.address))) {
 					continue;
 				}
 			}
 		}
 
 		if(find.type == SUBNET_MAC) {
-			if(memcmp(&find.net.mac.address, &subnet.net.mac.address, sizeof(subnet.net.mac))) {
+			if(memcmp(&find.net.mac.address, &subnet.net.mac.address, sizeof(subnet.net.mac.address))) {
 				continue;
 			}
 		}