Merge remote-tracking branch 'ni/master'
This commit is contained in:
commit
2407577433
@ -12,7 +12,8 @@ let {
|
||||
|
||||
inherit netname;
|
||||
netCIDR = "${netAddress}/${toString netPrefixLength}";
|
||||
netAddress = appendZeros netPrefixLength netPrefix;
|
||||
netAddress =
|
||||
normalize-ip6-addr (appendZeros addressLength netPrefix);
|
||||
netHash = toString {
|
||||
retiolum = 0;
|
||||
wirelum = 1;
|
||||
@ -25,7 +26,8 @@ let {
|
||||
|
||||
inherit subnetname;
|
||||
subnetCIDR = "${subnetAddress}/${toString subnetPrefixLength}";
|
||||
subnetAddress = appendZeros subnetPrefixLength subnetPrefix;
|
||||
subnetAddress =
|
||||
normalize-ip6-addr (appendZeros addressLength subnetPrefix);
|
||||
subnetHash = hashToLength 4 subnetname;
|
||||
subnetPrefix = joinAddress netPrefix subnetHash;
|
||||
subnetPrefixLength = netPrefixLength + 16;
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 21a894dc6f0a304655d2a30230510c8cb0e164b2
|
||||
Subproject commit 61b5ef3b8e7e4d601db67a20f14a5022e9de8398
|
Loading…
Reference in New Issue
Block a user