summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2018-12-15 12:28:05 +0100
committerlassulus <lassulus@lassul.us>2018-12-15 12:28:05 +0100
commit24075774336ff4546959f8465ac6584af2f94f3a (patch)
tree2f37ab3cdbd3c721f3250f437f770536e6e105ec
parent9a9a6d0a90072890b8946266abff1d98647c52fc (diff)
parent9147488383123117539b9a8829ee33ebbfe8b4e3 (diff)
Merge remote-tracking branch 'ni/master'
-rw-r--r--lib/krebs/genipv6.nix6
m---------submodules/krops0
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/krebs/genipv6.nix b/lib/krebs/genipv6.nix
index af1df6d0e..1d3f398ec 100644
--- a/lib/krebs/genipv6.nix
+++ b/lib/krebs/genipv6.nix
@@ -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;
diff --git a/submodules/krops b/submodules/krops
-Subproject 21a894dc6f0a304655d2a30230510c8cb0e164b
+Subproject 61b5ef3b8e7e4d601db67a20f14a5022e9de839