From bc62af7f7dbfcd66faa30a4e9031d936bdf7a0bc Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Tue, 6 Nov 2018 12:32:16 +0000
Subject: [PATCH] Enable CKR properly from config

---
 src/yggdrasil/ckr.go  | 4 ++++
 src/yggdrasil/core.go | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/yggdrasil/ckr.go b/src/yggdrasil/ckr.go
index c155866..baa0058 100644
--- a/src/yggdrasil/ckr.go
+++ b/src/yggdrasil/ckr.go
@@ -37,6 +37,10 @@ func (c *cryptokey) init(core *Core) {
 	c.ipv6sources = make([]net.IPNet, 0)
 }
 
+func (c *cryptokey) setEnabled(enabled bool) {
+	c.enabled = enabled
+}
+
 func (c *cryptokey) isEnabled() bool {
 	return c.enabled
 }
diff --git a/src/yggdrasil/core.go b/src/yggdrasil/core.go
index 10cf272..3a3531f 100644
--- a/src/yggdrasil/core.go
+++ b/src/yggdrasil/core.go
@@ -121,7 +121,8 @@ func (c *Core) Start(nc *config.NodeConfig, log *log.Logger) error {
 		return err
 	}
 
-	if nc.TunnelRouting.Enable {
+	c.router.cryptokey.setEnabled(nc.TunnelRouting.Enable)
+	if c.router.cryptokey.isEnabled() {
 		c.log.Println("Crypto-key routing enabled")
 		for ipv6, pubkey := range nc.TunnelRouting.IPv6Destinations {
 			if err := c.router.cryptokey.addRoute(ipv6, pubkey); err != nil {