Move a couple of commmon bits of code out to utils.go

This commit is contained in:
Bryan Boreham committed 2014-09-09 13:06:37 +01:00
1 parent 527ddfca0d
commit c1856e1ff1
3 files changed
+23 -22

No files matched your search

+2 -13
View File
@@ -57,19 +57,8 @@ func (peer *Peer) ConnectionTo(name PeerName) (Connection, bool) {
return conn, found // yes, you really can't inline that. FFS.
}
// given an address like '1.2.3.4:567', return the address if it has a port,
// otherwise return the address with weave's standard port number
func normalisePeerAddr(peerAddr string) string {
_, _, err := net.SplitHostPort(peerAddr)
if err == nil {
return peerAddr
} else {
return fmt.Sprintf("%s:%d", peerAddr, Port)
}
}
func (peer *Peer) ConnectionOn(peerAddr string) (Connection, bool) {
peerAddr = normalisePeerAddr(peerAddr)
peerAddr = NormalisePeerAddr(peerAddr)
peer.RLock()
defer peer.RUnlock()
for _, conn := range peer.connections {
@@ -220,7 +209,7 @@ func (peer *Peer) CreateConnection(peerAddr string, acceptNewPeer bool) error {
return err
}
// We're dialing the remote so that means connections will come from random ports
addrStr := normalisePeerAddr(peerAddr)
addrStr := NormalisePeerAddr(peerAddr)
tcpAddr, tcpErr := net.ResolveTCPAddr("tcp4", addrStr)
udpAddr, udpErr := net.ResolveUDPAddr("udp4", addrStr)
if tcpErr != nil || udpErr != nil {