From 2d96202a58c7160d8a9b95a951d08d495a80a24a Mon Sep 17 00:00:00 2001 From: niten Date: Fri, 3 Nov 2023 12:51:28 -0700 Subject: [PATCH] Ugh, WHAT! --- lib/lib/ip.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/lib/ip.nix b/lib/lib/ip.nix index e405625..3dd8c8d 100644 --- a/lib/lib/ip.nix +++ b/lib/lib/ip.nix @@ -65,15 +65,13 @@ in rec { ipv4OnNetwork = ip: network: let ip-int = ipv4ToInt ip; - net-min = networkMinIp network; - net-max = networkMaxIp network; - in (ip-int >= (ipv4ToInt networkMinIp)) - && (ip-int <= (ipv4ToInt networkMaxIp)); + netMin = networkMinIp network; + netMax = networkMaxIp network; + in (ip-int >= (ipv4ToInt netMin)) && (ip-int <= (ipv4ToInt netMax)); getNetworkMask = network: toInt (elemAt (splitString "/" network) 1); getNetworkBase = network: - assert (builtins.match ".+/[0-9]+" network) != null; let ip = elemAt (splitString "/" network) 0; insignificantBits = 32 - (getNetworkMask network);