fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-04-25 06:42:16 +00:00
Code Issues Projects Releases Wiki Activity

p2p: fix comment on addPeer (thanks @odeke-em)

Browse Source
This commit is contained in:
Ethan Buchman 2017-11-20 21:36:01 +00:00
parent 26cd99c66e
commit f9bc22ec6a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
p2p/switch.go
View File

@ -212,7 +212,7 @@ func (sw *Switch) OnStop() {
// addPeer checks the given peer's validity, performs a handshake, and adds the // addPeer checks the given peer's validity, performs a handshake, and adds the
// peer to the switch and to all registered reactors. // peer to the switch and to all registered reactors.
// NOTE: This performs a blocking handshake before the peer is added. // NOTE: This performs a blocking handshake before the peer is added.
// CONTRACT: If error is returned, peer is nil, and conn is immediately closed. // NOTE: If error is returned, caller is responsible for calling peer.CloseConn()
func (sw *Switch) addPeer(peer *peer) error { func (sw *Switch) addPeer(peer *peer) error {
if err := sw.FilterConnByAddr(peer.Addr()); err != nil { if err := sw.FilterConnByAddr(peer.Addr()); err != nil {
@ -570,7 +570,7 @@ func (sw *Switch) addPeerWithConnection(conn net.Conn) error {
} }
peer.SetLogger(sw.Logger.With("peer", conn.RemoteAddr())) peer.SetLogger(sw.Logger.With("peer", conn.RemoteAddr()))
if err = sw.addPeer(peer); err != nil { if err = sw.addPeer(peer); err != nil {
conn.Close() peer.CloseConn()
return err return err
} }
@ -585,7 +585,7 @@ func (sw *Switch) addPeerWithConnectionAndConfig(conn net.Conn, config *PeerConf
} }
peer.SetLogger(sw.Logger.With("peer", conn.RemoteAddr())) peer.SetLogger(sw.Logger.With("peer", conn.RemoteAddr()))
if err = sw.addPeer(peer); err != nil { if err = sw.addPeer(peer); err != nil {
conn.Close() peer.CloseConn()
return err return err
} }