lib.krebs.genipv6: normalize net addresses

This commit is contained in:
tv 2018-12-14 20:03:26 +01:00
parent 2d243bbeac
commit ede763d77a

View File

@ -12,7 +12,8 @@ let {
inherit netname; inherit netname;
netCIDR = "${netAddress}/${toString netPrefixLength}"; netCIDR = "${netAddress}/${toString netPrefixLength}";
netAddress = appendZeros addressLength netPrefix; netAddress =
normalize-ip6-addr (appendZeros addressLength netPrefix);
netHash = toString { netHash = toString {
retiolum = 0; retiolum = 0;
wirelum = 1; wirelum = 1;
@ -25,7 +26,8 @@ let {
inherit subnetname; inherit subnetname;
subnetCIDR = "${subnetAddress}/${toString subnetPrefixLength}"; subnetCIDR = "${subnetAddress}/${toString subnetPrefixLength}";
subnetAddress = appendZeros addressLength subnetPrefix; subnetAddress =
normalize-ip6-addr (appendZeros addressLength subnetPrefix);
subnetHash = hashToLength 4 subnetname; subnetHash = hashToLength 4 subnetname;
subnetPrefix = joinAddress netPrefix subnetHash; subnetPrefix = joinAddress netPrefix subnetHash;
subnetPrefixLength = netPrefixLength + 16; subnetPrefixLength = netPrefixLength + 16;