From: Jason A. Donenfeld <Jason@zx2c4.com>
Date: Tue, 10 May 2022 10:40:49 +0000 (+0200)
Subject: wg-quick: android: use right regex for host-vs-IP
X-Git-Tag: v1.0.20250521~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c0b68d2eafaf2b44df9377ba0844bc315163247e;p=thirdparty%2Fwireguard-tools.git

wg-quick: android: use right regex for host-vs-IP

Looks like the "is valid ifname" regex was copy and pasted from
wg-quick.bash instead of the "is valid IP" regex.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---

diff --git a/src/wg-quick/android.c b/src/wg-quick/android.c
index a5a789a..1263ee4 100644
--- a/src/wg-quick/android.c
+++ b/src/wg-quick/android.c
@@ -855,7 +855,7 @@ static void set_dnses(unsigned int netid, const char *dnses)
 	if (!len)
 		return;
 
-	xregcomp(&regex_ipnothost, "^[a-zA-Z0-9_=+.-]{1,15}$", REG_EXTENDED | REG_NOSUB);
+	xregcomp(&regex_ipnothost, "(^[0-9.]+$)|(^.*:.*$)", REG_EXTENDED | REG_NOSUB);
 	for (char *dns = strtok(mutable, ", \t\n"); dns; dns = strtok(NULL, ", \t\n")) {
 		if (strchr(dns, '\'') || strchr(dns, '\\'))
 			continue;