fixes various vet errors

[btrtrc.git] / client.go

diff --git a/client.go b/client.go
index 2de19a1e928eead57a9fd2eafbeae595df46241d..260219cb4e14df6f277c32f5e14d394352238cf9 100644 (file)
--- a/client.go
+++ b/client.go
@@ -1298,12 +1298,12 @@ func (cl *Client) publicIp(peer net.IP) net.IP {
                        cl.config.PublicIp4,
                        cl.findListenerIp(func(ip net.IP) bool { return ip.To4() != nil }),
                )
-       } else {
-               return firstNotNil(
-                       cl.config.PublicIp6,
-                       cl.findListenerIp(func(ip net.IP) bool { return ip.To4() == nil }),
-               )
        }
+
+       return firstNotNil(
+               cl.config.PublicIp6,
+               cl.findListenerIp(func(ip net.IP) bool { return ip.To4() == nil }),
+       )
 }
 
 func (cl *Client) findListenerIp(f func(net.IP) bool) net.IP {
@@ -1314,9 +1314,10 @@ func (cl *Client) findListenerIp(f func(net.IP) bool) net.IP {
 
 // Our IP as a peer should see it.
 func (cl *Client) publicAddr(peer net.IP) IpPort {
-       return IpPort{cl.publicIp(peer), uint16(cl.incomingPeerPort())}
+       return IpPort{IP: cl.publicIp(peer), Port: uint16(cl.incomingPeerPort())}
 }
 
+// ListenAddrs addresses currently being listened to.
 func (cl *Client) ListenAddrs() (ret []net.Addr) {
        cl.lock()
        defer cl.unlock()