diff options
| author | Andrey Petrov <shazow@gmail.com> | 2018-02-27 18:52:59 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2018-02-27 18:52:59 +0800 |
| commit | 2e9c8fd4fbd5d0de0ced03961d268c7492917860 (patch) | |
| tree | 83ca6e575f5ac94a79245a58c7a237cb2086e0ef | |
| parent | 4c845bdc271c46706ea4af248a1efec8683dc53a (diff) | |
| download | go-tangerine-2e9c8fd4fbd5d0de0ced03961d268c7492917860.tar go-tangerine-2e9c8fd4fbd5d0de0ced03961d268c7492917860.tar.gz go-tangerine-2e9c8fd4fbd5d0de0ced03961d268c7492917860.tar.bz2 go-tangerine-2e9c8fd4fbd5d0de0ced03961d268c7492917860.tar.lz go-tangerine-2e9c8fd4fbd5d0de0ced03961d268c7492917860.tar.xz go-tangerine-2e9c8fd4fbd5d0de0ced03961d268c7492917860.tar.zst go-tangerine-2e9c8fd4fbd5d0de0ced03961d268c7492917860.zip | |
eth, les: allow exceeding maxPeers for trusted peers (#16189)
Fixes #3326, #14472
| -rw-r--r-- | eth/handler.go | 3 | ||||
| -rw-r--r-- | les/handler.go | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/eth/handler.go b/eth/handler.go index c2426544f..3fae0cd00 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -249,7 +249,8 @@ func (pm *ProtocolManager) newPeer(pv int, p *p2p.Peer, rw p2p.MsgReadWriter) *p // handle is the callback invoked to manage the life cycle of an eth peer. When // this function terminates, the peer is disconnected. func (pm *ProtocolManager) handle(p *peer) error { - if pm.peers.Len() >= pm.maxPeers { + // Ignore maxPeers if this is a trusted peer + if pm.peers.Len() >= pm.maxPeers && !p.Peer.Info().Network.Trusted { return p2p.DiscTooManyPeers } p.Log().Debug("Ethereum peer connected", "name", p.Name()) diff --git a/les/handler.go b/les/handler.go index 864abe605..9627f392b 100644 --- a/les/handler.go +++ b/les/handler.go @@ -260,7 +260,8 @@ func (pm *ProtocolManager) newPeer(pv int, nv uint64, p *p2p.Peer, rw p2p.MsgRea // handle is the callback invoked to manage the life cycle of a les peer. When // this function terminates, the peer is disconnected. func (pm *ProtocolManager) handle(p *peer) error { - if pm.peers.Len() >= pm.maxPeers { + // Ignore maxPeers if this is a trusted peer + if pm.peers.Len() >= pm.maxPeers && !p.Peer.Info().Network.Trusted { return p2p.DiscTooManyPeers } |