Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'ni/master'

Browse Source
This commit is contained in:
lassulus 2018-12-15 12:28:05 +01:00
commit 2407577433
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/krebs/genipv6.nix
View File

@ -12,7 +12,8 @@ let {
inherit netname; inherit netname;
netCIDR = "${netAddress}/${toString netPrefixLength}"; netCIDR = "${netAddress}/${toString netPrefixLength}";
netAddress = appendZeros netPrefixLength 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 subnetPrefixLength 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;

2
submodules/krops

@ -1 +1 @@
Subproject commit 21a894dc6f0a304655d2a30230510c8cb0e164b2 Subproject commit 61b5ef3b8e7e4d601db67a20f14a5022e9de8398