fix duplicate ip in allowedips

1 year ago · 47414c584d
parent 2121bf3091
commit 47414c584d
2 changed files with 8 additions and 4 deletions
--- 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)}")
--- 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)
+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)}")