Use lib for getNetworkBase/Mask

This commit is contained in:
niten 2023-11-03 13:35:36 -07:00
parent 070c2d60d9
commit 94d932389b
1 changed files with 4 additions and 3 deletions

View File

@ -6,7 +6,8 @@
with pkgs.lib; with pkgs.lib;
let let
inherit (pkgs.lib.ip) networkMinIp networkMaxButOneIp ipv4OnNetwork; inherit (pkgs.lib.ip)
networkMinIp networkMaxButOneIp ipv4OnNetwork getNetworkMask getNetworkBase;
range = base: top: range = base: top:
assert base < top; assert base < top;
@ -22,8 +23,8 @@ let
getNetworkZoneName = network: getNetworkZoneName = network:
let let
netElems = splitString "/" network; netElems = splitString "/" network;
netIp = elemAt netElems 0; netIp = getNetworkBase network;
netMask = elemAt netElems 1; netMask = getNetworkMask network;
reversedNetIp = reversedNetIp =
concatStringsSep "." (tail (reverseList (splitString "." netIp))); concatStringsSep "." (tail (reverseList (splitString "." netIp)));
in if netMask == "24" then in if netMask == "24" then