forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

p2p: ensure dial resolver is truly nil without discovery

Browse source
This commit is contained in:
Felix Lange 2020-01-28 14:05:04 +01:00
parent 8cefa07079
commit 323d2f5631
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
p2p/server.go
View file

@ -599,12 +599,14 @@ func (srv *Server) setupDialScheduler() {
self: srv.localnode.ID(), self: srv.localnode.ID(),
maxDialPeers: srv.maxDialedConns(), maxDialPeers: srv.maxDialedConns(),
maxActiveDials: srv.MaxPendingPeers, maxActiveDials: srv.MaxPendingPeers,
resolver: srv.ntab,
log: srv.Logger, log: srv.Logger,
netRestrict: srv.NetRestrict, netRestrict: srv.NetRestrict,
dialer: srv.Dialer, dialer: srv.Dialer,
clock: srv.clock, clock: srv.clock,
} }
if srv.ntab != nil {
config.resolver = srv.ntab
}
if config.dialer == nil { if config.dialer == nil {
config.dialer = tcpDialer{&net.Dialer{Timeout: defaultDialTimeout}} config.dialer = tcpDialer{&net.Dialer{Timeout: defaultDialTimeout}}
} }