fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-13 05:11:21 +00:00
Code Issues Projects Releases Wiki Activity

Incoporate review feedback

Browse Source
This commit is contained in:
Alexander Simmerl
2018-05-23 01:53:37 +02:00
parent e11f3167ff
commit 01fd102dba
3 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
p2p/peer.go
View File

@ -41,7 +41,7 @@ type peerConn struct {
persistent bool
config *PeerConfig
conn net.Conn // source connection
ips []net.IP
ip net.IP
}
// ID only exists for SecretConnection.
@ -52,16 +52,16 @@ func (pc peerConn) ID() ID {
// Return the IP from the connection RemoteAddr
func (pc peerConn) RemoteIP() net.IP {
if len(pc.ips) > 0 {
return pc.ips[0]
if pc.ip != nil {
return pc.ip
}
// In test cases a conn could not be present at all or be an in-memory
// implementation where we want to return a fake ip.
if pc.conn == nil || pc.conn.RemoteAddr().String() == "pipe" {
pc.ips = []net.IP{
net.IP{172, 16, 0, byte(atomic.AddUint32(&testIPSuffix, 1))},
}
pc.ip = net.IP{172, 16, 0, byte(atomic.AddUint32(&testIPSuffix, 1))}
return pc.ips[0]
return pc.ip
}
host, _, err := net.SplitHostPort(pc.conn.RemoteAddr().String())
@ -74,9 +74,9 @@ func (pc peerConn) RemoteIP() net.IP {
panic(err)
}
pc.ips = ips
pc.ip = ips[0]
return ips[0]
return pc.ip
}
// peer implements Peer.