From 6d0e40045ab8eb4c3c322a299073709d477c8d63 Mon Sep 17 00:00:00 2001
From: Arceliar <Arceliar@users.noreply.github.com>
Date: Thu, 22 Nov 2018 21:41:16 -0600
Subject: [PATCH] cleanup/fixes from go vet
---
src/yggdrasil/admin.go | 3 +--
src/yggdrasil/ckr.go | 4 +---
src/yggdrasil/dht.go | 1 -
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/yggdrasil/admin.go b/src/yggdrasil/admin.go
index de5ae878..1e85907c 100644
--- a/src/yggdrasil/admin.go
+++ b/src/yggdrasil/admin.go
@@ -456,7 +456,6 @@ func (n *admin_nodeInfo) toString() string {
out = append(out, fmt.Sprintf("%v: %v", p.key, p.val))
}
return strings.Join(out, ", ")
- return fmt.Sprint(*n)
}
// printInfos returns a newline separated list of strings from admin_nodeInfos, e.g. a printable string of info about all peers.
@@ -597,7 +596,7 @@ func (a *admin) getData_getSwitchPeers() []admin_nodeInfo {
// getData_getSwitchQueues returns info from Core.switchTable for an queue data.
func (a *admin) getData_getSwitchQueues() admin_nodeInfo {
var peerInfos admin_nodeInfo
- switchTable := a.core.switchTable
+ switchTable := &a.core.switchTable
getSwitchQueues := func() {
queues := make([]map[string]interface{}, 0)
for k, v := range switchTable.queues.bufs {
diff --git a/src/yggdrasil/ckr.go b/src/yggdrasil/ckr.go
index a2a29e9d..b73946c4 100644
--- a/src/yggdrasil/ckr.go
+++ b/src/yggdrasil/ckr.go
@@ -200,8 +200,6 @@ func (c *cryptokey) addRoute(cidr string, dest string) error {
c.core.log.Println("Added CKR destination subnet", cidr)
return nil
}
-
- return errors.New("Unspecified error")
}
// Looks up the most specific route for the given address (with the address
@@ -332,7 +330,7 @@ func (c *cryptokey) removeRoute(cidr string, dest string) error {
for k := range *routingcache {
delete(*routingcache, k)
}
- c.core.log.Println("Removed CKR destination subnet %s via %s", cidr, dest)
+ c.core.log.Printf("Removed CKR destination subnet %s via %s\n", cidr, dest)
return nil
}
}
diff --git a/src/yggdrasil/dht.go b/src/yggdrasil/dht.go
index 220e291a..31acd8a2 100644
--- a/src/yggdrasil/dht.go
+++ b/src/yggdrasil/dht.go
@@ -102,7 +102,6 @@ func (t *dht) insert(info *dhtInfo) {
if *info.getNodeID() == t.nodeID {
// This shouldn't happen, but don't add it if it does
return
- panic("FIXME")
}
info.recv = time.Now()
if oldInfo, isIn := t.table[*info.getNodeID()]; isIn {