From 461d632d5c57bb179f2dae0b164b2d7d99d7432c Mon Sep 17 00:00:00 2001 From: Tom Haley Date: Thu, 5 Dec 2024 10:54:19 +0300 Subject: [PATCH] luci-proto-wireguard: fixed incorrect peer detection for ipv6 and default port Fixed incorrect peer detection if IP v6 is used and no port for peer is defined. Signed-off-by: Tom Haley --- .../root/usr/share/rpcd/ucode/luci.wireguard | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/protocols/luci-proto-wireguard/root/usr/share/rpcd/ucode/luci.wireguard b/protocols/luci-proto-wireguard/root/usr/share/rpcd/ucode/luci.wireguard index 32acbb639d..55f0bba2a9 100644 --- a/protocols/luci-proto-wireguard/root/usr/share/rpcd/ucode/luci.wireguard +++ b/protocols/luci-proto-wireguard/root/usr/share/rpcd/ucode/luci.wireguard @@ -20,10 +20,10 @@ function checkPeerHost(configHost, configPort, wgHost) { const hostIp = replace(wgHost, /\[|\]/g, ""); if (ips) { for (let line = ips.read('line'); length(line); line = ips.read('line')) { - const ip = rtrim(line, '\n'); + const ip = rtrim(line, '\n'); if (configPort && (ip + ":" + configPort == hostIp)) { return true; - } else if (ip == substr(hostIp, 0, index(hostIp, ":"))) { + } else if (ip == substr(hostIp, 0, rindex(hostIp, ":"))) { return true; } } -- 2.30.2