From 339f85cbcb185fe9fbc5b4dfca674a3c50bf2d45 Mon Sep 17 00:00:00 2001 From: Matthias Radestock Date: Tue, 14 Apr 2015 13:18:40 +0100 Subject: [PATCH] get rid of Router.NormalisePeerAddr There was only one call site left and it always gets invoked with an ip:port, so normalisation is a no-op. Also remove mysterious comment. --- router/local_peer.go | 6 ++---- router/router.go | 10 ---------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/router/local_peer.go b/router/local_peer.go index 651d055b..63e93c73 100644 --- a/router/local_peer.go +++ b/router/local_peer.go @@ -93,10 +93,8 @@ func (peer *LocalPeer) CreateConnection(peerAddr string, acceptNewPeer bool) err if err := peer.checkConnectionLimit(); err != nil { return err } - // We're dialing the remote so that means connections will come from random ports - addrStr := peer.router.NormalisePeerAddr(peerAddr) - tcpAddr, tcpErr := net.ResolveTCPAddr("tcp4", addrStr) - udpAddr, udpErr := net.ResolveUDPAddr("udp4", addrStr) + tcpAddr, tcpErr := net.ResolveTCPAddr("tcp4", peerAddr) + udpAddr, udpErr := net.ResolveUDPAddr("udp4", peerAddr) if tcpErr != nil || udpErr != nil { // they really should have the same value, but just in case... if tcpErr == nil { diff --git a/router/router.go b/router/router.go index 33547742..450216ef 100644 --- a/router/router.go +++ b/router/router.go @@ -417,13 +417,3 @@ func (router *Router) applyTopologyUpdate(update []byte) (PeerNameSet, PeerNameS } return origUpdate, newUpdate, nil } - -// given an address like '1.2.3.4:567', return the address if it has a port, -// otherwise return the address with the default port number for the router -func (router *Router) NormalisePeerAddr(peerAddr string) string { - _, _, err := net.SplitHostPort(peerAddr) - if err == nil { - return peerAddr - } - return fmt.Sprintf("%s:%d", peerAddr, router.Port) -}