akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

server: use correct inbound value for peerConnected calls

Browse Source 
In this commit, we address the meaning of the inbound parameter to
peerConnected. An inbound connection is defined as a connection
initiated by the peer, rather than ourselves.

We also update the inbound value for the peerConnected calls within
OutboundPeerConnected and InboundPeerConnected to reflect the definition
above.
This commit is contained in:
Wilmer Paulino 2018-04-03 01:16:04 -04:00
parent 782fd9d709
commit 09253eacc3
No known key found for this signature in database
GPG Key ID: 6DF57B9F9514972F
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
server.go
View File

@ -1537,7 +1537,8 @@ func (s *server) shouldRequestGraphSync() bool {
// peerConnected is a function that handles initialization a newly connected // peerConnected is a function that handles initialization a newly connected
// peer by adding it to the server's global list of all active peers, and // peer by adding it to the server's global list of all active peers, and
// starting all the goroutines the peer needs to function properly. // starting all the goroutines the peer needs to function properly. The inbound
// boolean should be true if the peer initiated the connection to us.
func (s *server) peerConnected(conn net.Conn, connReq *connmgr.ConnReq, func (s *server) peerConnected(conn net.Conn, connReq *connmgr.ConnReq,
inbound bool) { inbound bool) {
@ -1549,7 +1550,7 @@ func (s *server) peerConnected(conn net.Conn, connReq *connmgr.ConnReq,
// peer's address for reconnection purposes. // peer's address for reconnection purposes.
// //
// TODO: leave the address field empty if there aren't any? // TODO: leave the address field empty if there aren't any?
if !inbound { if inbound {
advertisedAddr, err := s.fetchNodeAdvertisedAddr(pubKey) advertisedAddr, err := s.fetchNodeAdvertisedAddr(pubKey)
if err != nil { if err != nil {
srvrLog.Errorf("Unable to retrieve advertised address "+ srvrLog.Errorf("Unable to retrieve advertised address "+
@ -1672,7 +1673,7 @@ func (s *server) InboundPeerConnected(conn net.Conn) {
case ErrPeerNotConnected: case ErrPeerNotConnected:
// We were unable to locate an existing connection with the // We were unable to locate an existing connection with the
// target peer, proceed to connect. // target peer, proceed to connect.
s.peerConnected(conn, nil, false) s.peerConnected(conn, nil, true)
case nil: case nil:
// We already have a connection with the incoming peer. If the // We already have a connection with the incoming peer. If the
@ -1699,7 +1700,7 @@ func (s *server) InboundPeerConnected(conn net.Conn) {
s.removePeer(connectedPeer) s.removePeer(connectedPeer)
s.ignorePeerTermination[connectedPeer] = struct{}{} s.ignorePeerTermination[connectedPeer] = struct{}{}
s.scheduledPeerConnection[pubStr] = func() { s.scheduledPeerConnection[pubStr] = func() {
s.peerConnected(conn, nil, false) s.peerConnected(conn, nil, true)
} }
} }
} }
@ -1769,7 +1770,7 @@ func (s *server) OutboundPeerConnected(connReq *connmgr.ConnReq, conn net.Conn)
case ErrPeerNotConnected: case ErrPeerNotConnected:
// We were unable to locate an existing connection with the // We were unable to locate an existing connection with the
// target peer, proceed to connect. // target peer, proceed to connect.
s.peerConnected(conn, connReq, true) s.peerConnected(conn, connReq, false)
case nil: case nil:
// We already have a connection open with the target peer. // We already have a connection open with the target peer.
@ -1800,7 +1801,7 @@ func (s *server) OutboundPeerConnected(connReq *connmgr.ConnReq, conn net.Conn)
s.removePeer(connectedPeer) s.removePeer(connectedPeer)
s.ignorePeerTermination[connectedPeer] = struct{}{} s.ignorePeerTermination[connectedPeer] = struct{}{}
s.scheduledPeerConnection[pubStr] = func() { s.scheduledPeerConnection[pubStr] = func() {
s.peerConnected(conn, connReq, true) s.peerConnected(conn, connReq, false)
} }
} }
} }