server: remove pending conn request if we recv a outbound conn after a scheduled callback

In this commit, we ensure that if we're already ignoring a connection,
then we also ignore the pending persistent connection request.
Otherwise, we'll move to accept the replaced connection, but then
continue to attempt connection requests.
This commit is contained in:
Olaoluwa Osuntokun 2018-06-08 20:36:41 -07:00
parent dcf841c33b
commit c975753f1e
No known key found for this signature in database
GPG Key ID: 964EA263DD637C21

View File

@ -1727,6 +1727,11 @@ func (s *server) OutboundPeerConnected(connReq *connmgr.ConnReq, conn net.Conn)
// ignore this connection.
if _, ok := s.scheduledPeerConnection[pubStr]; ok {
srvrLog.Debugf("Ignoring connection, peer already scheduled")
if connReq != nil {
s.connMgr.Remove(connReq.ID())
}
conn.Close()
return
}