fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-14 22:01:20 +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 persistent bool
config *PeerConfig config *PeerConfig
conn net.Conn // source connection conn net.Conn // source connection
ips []net.IP ip net.IP
} }
// ID only exists for SecretConnection. // ID only exists for SecretConnection.
@ -52,16 +52,16 @@ func (pc peerConn) ID() ID {
// Return the IP from the connection RemoteAddr // Return the IP from the connection RemoteAddr
func (pc peerConn) RemoteIP() net.IP { func (pc peerConn) RemoteIP() net.IP {
if len(pc.ips) > 0 { if pc.ip != nil {
return pc.ips[0] 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" { if pc.conn == nil || pc.conn.RemoteAddr().String() == "pipe" {
pc.ips = []net.IP{ pc.ip = net.IP{172, 16, 0, byte(atomic.AddUint32(&testIPSuffix, 1))}
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()) host, _, err := net.SplitHostPort(pc.conn.RemoteAddr().String())
@ -74,9 +74,9 @@ func (pc peerConn) RemoteIP() net.IP {
panic(err) panic(err)
} }
pc.ips = ips pc.ip = ips[0]
return ips[0] return pc.ip
} }
// peer implements Peer. // peer implements Peer.

4
p2p/peer_set_test.go
View File

@ -26,9 +26,7 @@ func randPeer(ip net.IP) *peer {
}, },
} }
p.ips = []net.IP{ p.ip = ip
ip,
}
return p return p
} }

7
p2p/switch.go
View File

@ -534,8 +534,6 @@ func (sw *Switch) addPeer(pc peerConn) error {
return err return err
} }
// dont connect to multiple peers on the same IP
// NOTE: if AuthEnc==false, we don't have a peerID until after the handshake. // NOTE: if AuthEnc==false, we don't have a peerID until after the handshake.
// If AuthEnc==true then we already know the ID and could do the checks first before the handshake, // If AuthEnc==true then we already know the ID and could do the checks first before the handshake,
// but it's simple to just deal with both cases the same after the handshake. // but it's simple to just deal with both cases the same after the handshake.
@ -578,8 +576,9 @@ func (sw *Switch) addPeer(pc peerConn) error {
return ErrSwitchDuplicatePeerID{peerID} return ErrSwitchDuplicatePeerID{peerID}
} }
// check ips for both the connection addr and the self reported addr // Check for duplicate connection or peer info IP.
if sw.peers.HasIP(pc.RemoteIP()) { if sw.peers.HasIP(pc.RemoteIP()) ||
sw.peers.HasIP(peerNodeInfo.NetAddress().IP) {
return ErrSwitchDuplicatePeerIP{pc.RemoteIP()} return ErrSwitchDuplicatePeerIP{pc.RemoteIP()}
} }