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

server: wrap peer connection tiebreaking to 80 chars

Browse Source
This commit is contained in:
Conner Fromknecht 2019-03-26 16:41:30 -07:00
parent 7358535725
commit c5365160fb
No known key found for this signature in database
GPG Key ID: E7D737B67FA592C7
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
server.go
View File

@ -2156,14 +2156,17 @@ func (s *server) InboundPeerConnected(conn net.Conn) {
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
// connection we've already established should be kept and is not of // connection we've already established should be kept and is
// the same type of the new connection (inbound), then we'll close out // not of the same type of the new connection (inbound), then
// the new connection s.t there's only a single connection between us. // we'll close out the new connection s.t there's only a single
// connection between us.
localPub := s.identityPriv.PubKey() localPub := s.identityPriv.PubKey()
if !connectedPeer.inbound && !shouldDropLocalConnection(localPub, nodePub) { if !connectedPeer.inbound &&
srvrLog.Warnf("Received inbound connection from peer %v, "+ !shouldDropLocalConnection(localPub, nodePub) {
"but already have outbound connection, dropping conn",
connectedPeer) srvrLog.Warnf("Received inbound connection from "+
"peer %v, but already have outbound "+
"connection, dropping conn", connectedPeer)
conn.Close() conn.Close()
return return
} }
@ -2264,14 +2267,17 @@ func (s *server) OutboundPeerConnected(connReq *connmgr.ConnReq, conn net.Conn)
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
// connection we've already established should be kept and is not of // connection we've already established should be kept and is
// the same type of the new connection (outbound), then we'll close out // not of the same type of the new connection (outbound), then
// the new connection s.t there's only a single connection between us. // we'll close out the new connection s.t there's only a single
// connection between us.
localPub := s.identityPriv.PubKey() localPub := s.identityPriv.PubKey()
if connectedPeer.inbound && shouldDropLocalConnection(localPub, nodePub) { if connectedPeer.inbound &&
srvrLog.Warnf("Established outbound connection to peer %v, "+ shouldDropLocalConnection(localPub, nodePub) {
"but already have inbound connection, dropping conn",
connectedPeer) srvrLog.Warnf("Established outbound connection to "+
"peer %v, but already have inbound "+
"connection, dropping conn", connectedPeer)
if connReq != nil { if connReq != nil {
s.connMgr.Remove(connReq.ID()) s.connMgr.Remove(connReq.ID())
} }