From 99b49aef8fdd8de5009682fbee88450bcf77aa98 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Sat, 5 Nov 2016 21:35:33 +0100
Subject: tools: chill modern gcc out

---
 src/tools/config.c | 34 ++++++++++++----------------------
 1 file changed, 12 insertions(+), 22 deletions(-)

(limited to 'src/tools/config.c')

diff --git a/src/tools/config.c b/src/tools/config.c
index 24296f8..860845e 100644
--- a/src/tools/config.c
+++ b/src/tools/config.c
@@ -2,6 +2,7 @@
 
 
 #include <arpa/inet.h>
+#include <limits.h>
 #include <ctype.h>
 #include <netdb.h>
 #include <stdio.h>
@@ -220,7 +221,7 @@ static inline bool parse_ipmasks(struct inflatable_device *buf, size_t peer_offs
 	}
 	sep = mutable;
 	while ((mask = strsep(&sep, ","))) {
-		unsigned long cidr;
+		unsigned long cidr = ULONG_MAX;
 		char *end, *ip = strsep(&mask, "/");
 		if (use_space(buf, sizeof(struct wgipmask)) < 0) {
 			perror("use_space");
@@ -234,27 +235,16 @@ static inline bool parse_ipmasks(struct inflatable_device *buf, size_t peer_offs
 			free(mutable);
 			return false;
 		}
-		if (ipmask->family == AF_INET) {
-			if (mask) {
-				cidr = strtoul(mask, &end, 10);
-				if (*end)
-					mask = NULL;
-				if (cidr > 32)
-					mask = NULL;
-			}
-			if (!mask)
-				cidr = 32;
-		} else if (ipmask->family == AF_INET6) {
-			if (mask) {
-				cidr = strtoul(mask, &end, 10);
-				if (*end)
-					mask = NULL;
-				if (cidr > 128)
-					mask = NULL;
-			}
-			if (!mask)
-				cidr = 128;
-		} else
+		if (mask && *mask) {
+			cidr = strtoul(mask, &end, 10);
+			if (*end)
+				cidr = ULONG_MAX;
+		}
+		if (ipmask->family == AF_INET)
+			cidr = cidr > 32 ? 32 : cidr;
+		else if (ipmask->family == AF_INET6)
+			cidr = cidr > 128 ? 128 : cidr;
+		else
 			continue;
 		ipmask->cidr = cidr;
 		++peer->num_ipmasks;
-- 
cgit v1.2.3-59-g8ed1b