From 47414c584d0cbcf8789cffda7f8e8dfa13bb1afd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A1=9C=E5=BA=AD=E6=B8=85=E5=A4=8F?= Date: Thu, 16 Mar 2023 18:45:58 +0900 Subject: [PATCH] fix duplicate ip in allowedips --- wg.py | 6 ++++-- wgpy.py | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/wg.py b/wg.py index 6db419a..49a0543 100644 --- a/wg.py +++ b/wg.py @@ -49,5 +49,7 @@ for ipd in disallow_ip_raw: disallowed_ipv4.append(IPv4Network(ipd)) elif check_ip_network_type(ipd) == 6: disallowed_ipv6.append(IPv6Network(ipd)) -result = f"AllowedIPs = {', '.join(calc_wg_ip_range(allowed_ipv4, disallowed_ipv4) + calc_wg_ip_range(allowed_ipv6, disallowed_ipv6))}" -print(result) +result = calc_wg_ip_range(allowed_ipv4, disallowed_ipv4) + calc_wg_ip_range(allowed_ipv6, disallowed_ipv6) +output = list(set(result)) +output.sort(key=result.index) +print(f"AllowedIPs = {', '.join(output)}") diff --git a/wgpy.py b/wgpy.py index 1afa6db..179bdf7 100644 --- a/wgpy.py +++ b/wgpy.py @@ -45,5 +45,7 @@ for ipd in disallow_ip_raw: disallowed_ipv4.append(IPv4Network(ipd)) elif check_ip_network_type(ipd) == 6: disallowed_ipv6.append(IPv6Network(ipd)) -result = f"AllowedIPs = {', '.join(calc_wg_ip_range(allowed_ipv4, disallowed_ipv4) + calc_wg_ip_range(allowed_ipv6, disallowed_ipv6))}" -print(result) \ No newline at end of file +result = calc_wg_ip_range(allowed_ipv4, disallowed_ipv4) + calc_wg_ip_range(allowed_ipv6, disallowed_ipv6) +output = list(set(result)) +output.sort(key=result.index) +print(f"AllowedIPs = {', '.join(output)}")