X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fsubnet.c;h=446d38b15f4c86ec34a583b5126705419616bcdf;hb=26a228e3025c3970fd461af777013e3807b0fc58;hp=46006a169dec15ac98f295ca2ecbd9574e6effd7;hpb=76165488f8201a59e649b4eec02ee31398b3fb92;p=tinc

diff --git a/src/subnet.c b/src/subnet.c
index 46006a16..446d38b1 100644
--- a/src/subnet.c
+++ b/src/subnet.c
@@ -43,7 +43,7 @@ static int subnet_compare_mac(const subnet_t *a, const subnet_t *b)
 {
 	int result;
 
-	result = memcmp(&a->net.mac.address, &b->net.mac.address, sizeof(mac_t));
+	result = memcmp(&a->net.mac.address, &b->net.mac.address, sizeof a->net.mac.address);
 
 	if(result || !a->owner || !b->owner)
 		return result;
@@ -55,7 +55,7 @@ static int subnet_compare_ipv4(const subnet_t *a, const subnet_t *b)
 {
 	int result;
 
-	result = memcmp(&a->net.ipv4.address, &b->net.ipv4.address, sizeof(ipv4_t));
+	result = memcmp(&a->net.ipv4.address, &b->net.ipv4.address, sizeof a->net.ipv4.address);
 
 	if(result)
 		return result;
@@ -72,7 +72,7 @@ static int subnet_compare_ipv6(const subnet_t *a, const subnet_t *b)
 {
 	int result;
 
-	result = memcmp(&a->net.ipv6.address, &b->net.ipv6.address, sizeof(ipv6_t));
+	result = memcmp(&a->net.ipv6.address, &b->net.ipv6.address, sizeof a->net.ipv6.address);
 
 	if(result)
 		return result;
@@ -219,9 +219,6 @@ bool str2net(subnet_t *subnet, const char *subnetstr)
 	}
 
 	if(sscanf(subnetstr, "%hu.%hu.%hu.%hu", &x[0], &x[1], &x[2], &x[3]) == 4) {
-		if(l < 0 || l > 32)
-			return false;
-
 		subnet->type = SUBNET_IPV4;
 		subnet->net.ipv4.prefixlength = 32;
 
@@ -236,9 +233,6 @@ bool str2net(subnet_t *subnet, const char *subnetstr)
 
 	if(sscanf(subnetstr, "%hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx",
 			  &x[0], &x[1], &x[2], &x[3], &x[4], &x[5], &x[6], &x[7]) == 8) {
-		if(l < 0 || l > 128)
-			return false;
-
 		subnet->type = SUBNET_IPV6;
 		subnet->net.ipv6.prefixlength = 128;
 
@@ -368,7 +362,7 @@ subnet_t *lookup_subnet_ipv4(const ipv4_t *address)
 				subnet.net.ipv4.prefixlength = p->net.ipv4.prefixlength - 1;
 				if(subnet.net.ipv4.prefixlength < 0 || subnet.net.ipv4.prefixlength > 32)
 					return NULL;
-				maskcpy(&subnet.net.ipv4.address, &p->net.ipv4.address, subnet.net.ipv4.prefixlength, sizeof(ipv4_t));
+				maskcpy(&subnet.net.ipv4.address, &p->net.ipv4.address, subnet.net.ipv4.prefixlength, sizeof subnet.net.ipv4.address);
 			}
 		}
 	} while(p);
@@ -406,7 +400,7 @@ subnet_t *lookup_subnet_ipv6(const ipv6_t *address)
 				subnet.net.ipv6.prefixlength = p->net.ipv6.prefixlength - 1;
 				if(subnet.net.ipv6.prefixlength < 0 || subnet.net.ipv6.prefixlength > 128)
 					return NULL;
-				maskcpy(&subnet.net.ipv6.address, &p->net.ipv6.address, subnet.net.ipv6.prefixlength, sizeof(ipv6_t));
+				maskcpy(&subnet.net.ipv6.address, &p->net.ipv6.address, subnet.net.ipv6.prefixlength, sizeof subnet.net.ipv6.address);
 			}
 		}
 	} while(p);