From 57cad7eabc303c77a1a0ad6fff21912353807a29 Mon Sep 17 00:00:00 2001 From: Ryan Westlund Date: Thu, 14 May 2020 19:49:59 -0400 Subject: [PATCH] Accept some linter suggestions --- cmd/yggdrasil/main.go | 4 ++-- src/admin/admin.go | 23 +++++++++-------------- src/crypto/crypto.go | 2 +- src/tuntap/admin.go | 12 ++++-------- src/tuntap/iface.go | 1 - src/util/cancellation.go | 9 ++++----- src/yggdrasil/conn.go | 8 +++----- src/yggdrasil/link.go | 19 +++++++++---------- src/yggdrasil/nodeinfo.go | 6 +++--- src/yggdrasil/switch.go | 4 +--- src/yggdrasil/tcp.go | 8 +++----- src/yggdrasil/version.go | 6 +++--- 12 files changed, 42 insertions(+), 60 deletions(-) diff --git a/cmd/yggdrasil/main.go b/cmd/yggdrasil/main.go index b067ffbc..14b76c34 100644 --- a/cmd/yggdrasil/main.go +++ b/cmd/yggdrasil/main.go @@ -328,9 +328,9 @@ func main() { // deferred Stop function above will run which will shut down TUN/TAP. for { select { - case _ = <-c: + case <-c: goto exit - case _ = <-r: + case <-r: if *useconffile != "" { cfg = readConfig(useconf, useconffile, normaliseconf) logger.Infoln("Reloading configuration from", *useconffile) diff --git a/src/admin/admin.go b/src/admin/admin.go index fc7a3b6f..225f9dd6 100644 --- a/src/admin/admin.go +++ b/src/admin/admin.go @@ -53,7 +53,7 @@ func (a *AdminSocket) AddHandler(name string, args []string, handlerfunc func(In return nil } -// init runs the initial admin setup. +// Init runs the initial admin setup. func (a *AdminSocket) Init(c *yggdrasil.Core, state *config.NodeState, log *log.Logger, options interface{}) error { a.core = c a.log = log @@ -230,13 +230,12 @@ func (a *AdminSocket) SetupAdminHandlers(na *AdminSocket) { in["box_pub_key"].(string), }, }, nil - } else { - return Info{ - "not_removed": []string{ - in["box_pub_key"].(string), - }, - }, errors.New("Failed to remove allowed key") } + return Info{ + "not_removed": []string{ + in["box_pub_key"].(string), + }, + }, errors.New("Failed to remove allowed key") }) a.AddHandler("dhtPing", []string{"box_pub_key", "coords", "[target]"}, func(in Info) (Info, error) { var reserr error @@ -284,9 +283,8 @@ func (a *AdminSocket) SetupAdminHandlers(na *AdminSocket) { var jsoninfo interface{} if err := json.Unmarshal(nodeinfo, &jsoninfo); err != nil { return Info{}, err - } else { - return Info{"nodeinfo": jsoninfo}, nil } + return Info{"nodeinfo": jsoninfo}, nil } else if in["box_pub_key"] == nil || in["coords"] == nil { return Info{}, errors.New("Expecting both box_pub_key and coords") } else { @@ -302,12 +300,10 @@ func (a *AdminSocket) SetupAdminHandlers(na *AdminSocket) { var m map[string]interface{} if err = json.Unmarshal(result, &m); err == nil { return Info{"nodeinfo": m}, nil - } else { - return Info{}, err } - } else { return Info{}, err } + return Info{}, err }) } @@ -330,9 +326,8 @@ func (a *AdminSocket) Stop() error { if a.listener != nil { a.started = false return a.listener.Close() - } else { - return nil } + return nil } // listen is run by start and manages API connections. diff --git a/src/crypto/crypto.go b/src/crypto/crypto.go index 211a0e54..dd4013a7 100644 --- a/src/crypto/crypto.go +++ b/src/crypto/crypto.go @@ -272,7 +272,7 @@ func (n *BoxNonce) Increment() { n[len(n)-1] += 2 for i := len(n) - 2; i >= 0; i-- { if n[i+1] < oldNonce[i+1] { - n[i] += 1 + n[i]++ } } } diff --git a/src/tuntap/admin.go b/src/tuntap/admin.go index c7fc20b0..eb1eb69b 100644 --- a/src/tuntap/admin.go +++ b/src/tuntap/admin.go @@ -68,16 +68,14 @@ func (t *TunAdapter) SetupAdminHandlers(a *admin.AdminSocket) { a.AddHandler("addLocalSubnet", []string{"subnet"}, func(in admin.Info) (admin.Info, error) { if err := t.ckr.addLocalSubnet(in["subnet"].(string)); err == nil { return admin.Info{"added": []string{in["subnet"].(string)}}, nil - } else { - return admin.Info{"not_added": []string{in["subnet"].(string)}}, errors.New("Failed to add source subnet") } + return admin.Info{"not_added": []string{in["subnet"].(string)}}, errors.New("Failed to add source subnet") }) a.AddHandler("addRemoteSubnet", []string{"subnet", "box_pub_key"}, func(in admin.Info) (admin.Info, error) { if err := t.ckr.addRemoteSubnet(in["subnet"].(string), in["box_pub_key"].(string)); err == nil { return admin.Info{"added": []string{fmt.Sprintf("%s via %s", in["subnet"].(string), in["box_pub_key"].(string))}}, nil - } else { - return admin.Info{"not_added": []string{fmt.Sprintf("%s via %s", in["subnet"].(string), in["box_pub_key"].(string))}}, errors.New("Failed to add route") } + return admin.Info{"not_added": []string{fmt.Sprintf("%s via %s", in["subnet"].(string), in["box_pub_key"].(string))}}, errors.New("Failed to add route") }) a.AddHandler("getSourceSubnets", []string{}, func(in admin.Info) (admin.Info, error) { var subnets []string @@ -104,15 +102,13 @@ func (t *TunAdapter) SetupAdminHandlers(a *admin.AdminSocket) { a.AddHandler("removeLocalSubnet", []string{"subnet"}, func(in admin.Info) (admin.Info, error) { if err := t.ckr.removeLocalSubnet(in["subnet"].(string)); err == nil { return admin.Info{"removed": []string{in["subnet"].(string)}}, nil - } else { - return admin.Info{"not_removed": []string{in["subnet"].(string)}}, errors.New("Failed to remove source subnet") } + return admin.Info{"not_removed": []string{in["subnet"].(string)}}, errors.New("Failed to remove source subnet") }) a.AddHandler("removeRemoteSubnet", []string{"subnet", "box_pub_key"}, func(in admin.Info) (admin.Info, error) { if err := t.ckr.removeRemoteSubnet(in["subnet"].(string), in["box_pub_key"].(string)); err == nil { return admin.Info{"removed": []string{fmt.Sprintf("%s via %s", in["subnet"].(string), in["box_pub_key"].(string))}}, nil - } else { - return admin.Info{"not_removed": []string{fmt.Sprintf("%s via %s", in["subnet"].(string), in["box_pub_key"].(string))}}, errors.New("Failed to remove route") } + return admin.Info{"not_removed": []string{fmt.Sprintf("%s via %s", in["subnet"].(string), in["box_pub_key"].(string))}}, errors.New("Failed to remove route") }) } diff --git a/src/tuntap/iface.go b/src/tuntap/iface.go index 1e5902e8..bd849c7f 100644 --- a/src/tuntap/iface.go +++ b/src/tuntap/iface.go @@ -199,7 +199,6 @@ func (tun *TunAdapter) _handlePacket(recvd []byte, err error) { tc.writeFrom(nil, packet) } }) - return }() } } diff --git a/src/util/cancellation.go b/src/util/cancellation.go index 1f6d1658..7fc83147 100644 --- a/src/util/cancellation.go +++ b/src/util/cancellation.go @@ -54,12 +54,11 @@ func (c *cancellation) Cancel(err error) error { defer c.mutex.Unlock() if c.done { return c.err - } else { - c.err = err - c.done = true - close(c.cancel) - return nil } + c.err = err + c.done = true + close(c.cancel) + return nil } // Error returns the error provided to Cancel, or nil if no error has been provided. diff --git a/src/yggdrasil/conn.go b/src/yggdrasil/conn.go index eef57683..84f1ddf7 100644 --- a/src/yggdrasil/conn.go +++ b/src/yggdrasil/conn.go @@ -166,10 +166,9 @@ func (c *Conn) _getDeadlineCancellation(t *time.Time) (util.Cancellation, bool) // A deadline is set, so return a Cancellation that uses it c := util.CancellationWithDeadline(c.session.cancel, *t) return c, true - } else { - // No deadline was set, so just return the existing cancellation and a dummy value - return c.session.cancel, false } + // No deadline was set, so just return the existing cancellation and a dummy value + return c.session.cancel, false } // SetReadCallback allows you to specify a function that will be called whenever @@ -224,9 +223,8 @@ func (c *Conn) readNoCopy() ([]byte, error) { case <-cancel.Finished(): if cancel.Error() == util.CancellationTimeoutError { return nil, ConnError{errors.New("read timeout"), true, false, false, 0} - } else { - return nil, ConnError{errors.New("session closed"), false, false, true, 0} } + return nil, ConnError{errors.New("session closed"), false, false, true, 0} case bs := <-c.readBuffer: return bs, nil } diff --git a/src/yggdrasil/link.go b/src/yggdrasil/link.go index 157ea525..53e8c758 100644 --- a/src/yggdrasil/link.go +++ b/src/yggdrasil/link.go @@ -203,17 +203,16 @@ func (intf *linkInterface) handler() error { <-oldIntf.closed } return nil - } else { - intf.closed = make(chan struct{}) - intf.link.interfaces[intf.info] = intf - defer func() { - intf.link.mutex.Lock() - delete(intf.link.interfaces, intf.info) - intf.link.mutex.Unlock() - close(intf.closed) - }() - intf.link.core.log.Debugln("DEBUG: registered interface for", intf.name) } + intf.closed = make(chan struct{}) + intf.link.interfaces[intf.info] = intf + defer func() { + intf.link.mutex.Lock() + delete(intf.link.interfaces, intf.info) + intf.link.mutex.Unlock() + close(intf.closed) + }() + intf.link.core.log.Debugln("DEBUG: registered interface for", intf.name) intf.link.mutex.Unlock() // Create peer shared := crypto.GetSharedKey(myLinkPriv, &meta.link) diff --git a/src/yggdrasil/nodeinfo.go b/src/yggdrasil/nodeinfo.go index fc6250d6..8d502f41 100644 --- a/src/yggdrasil/nodeinfo.go +++ b/src/yggdrasil/nodeinfo.go @@ -136,15 +136,15 @@ func (m *nodeinfo) _setNodeInfo(given interface{}, privacy bool) error { newnodeinfo[key] = value } } - if newjson, err := json.Marshal(newnodeinfo); err == nil { + newjson, err := json.Marshal(newnodeinfo) + if err == nil { if len(newjson) > 16384 { return errors.New("NodeInfo exceeds max length of 16384 bytes") } m.myNodeInfo = newjson return nil - } else { - return err } + return err } // Add nodeinfo into the cache for a node diff --git a/src/yggdrasil/switch.go b/src/yggdrasil/switch.go index 5e4d3e92..23298e76 100644 --- a/src/yggdrasil/switch.go +++ b/src/yggdrasil/switch.go @@ -532,7 +532,6 @@ func (t *switchTable) unlockedHandleMsg(msg *switchMsg, fromPort switchPort, rep if true || doUpdate { t.updater.Store(&sync.Once{}) } - return } //////////////////////////////////////////////////////////////////////////////// @@ -615,9 +614,8 @@ func (t *switchTable) portIsCloser(dest []byte, port switchPort) bool { theirDist := info.locator.dist(dest) myDist := table.self.dist(dest) return theirDist < myDist - } else { - return false } + return false } // Get the coords of a packet without decoding diff --git a/src/yggdrasil/tcp.go b/src/yggdrasil/tcp.go index 9cca4193..d7c321b3 100644 --- a/src/yggdrasil/tcp.go +++ b/src/yggdrasil/tcp.go @@ -196,10 +196,9 @@ func (t *tcp) listener(l *TcpListener, listenaddr string) { t.mutex.Unlock() l.Listener.Close() return - } else { - t.listeners[listenaddr] = l - t.mutex.Unlock() } + t.listeners[listenaddr] = l + t.mutex.Unlock() // And here we go! defer func() { t.link.core.log.Infoln("Stopping TCP listener on:", l.Listener.Addr().String()) @@ -363,9 +362,8 @@ func (t *tcp) handler(sock net.Conn, incoming bool, options interface{}, upgrade if sock, err = upgrade.upgrade(sock); err != nil { t.link.core.log.Errorln("TCP handler upgrade failed:", err) return - } else { - upgraded = true } + upgraded = true } stream := stream{} stream.init(sock) diff --git a/src/yggdrasil/version.go b/src/yggdrasil/version.go index 91fcc825..e0cb38e3 100644 --- a/src/yggdrasil/version.go +++ b/src/yggdrasil/version.go @@ -28,11 +28,11 @@ func version_getBaseMetadata() version_metadata { } } -// Gest the length of the metadata for this version, used to know how many bytes to read from the start of a connection. +// Gets the length of the metadata for this version, used to know how many bytes to read from the start of a connection. func version_getMetaLength() (mlen int) { mlen += 4 // meta - mlen += 1 // ver, as long as it's < 127, which it is in this version - mlen += 1 // minorVer, as long as it's < 127, which it is in this version + mlen++ // ver, as long as it's < 127, which it is in this version + mlen++ // minorVer, as long as it's < 127, which it is in this version mlen += crypto.BoxPubKeyLen // box mlen += crypto.SigPubKeyLen // sig mlen += crypto.BoxPubKeyLen // link