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

les: fixed peerSet.Disconnect

Browse source
This commit is contained in:
Zsolt Felfoldi 2019-12-26 17:52:57 +01:00
parent 0fc06ea8af
commit 6f1abbf2b5
1 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
les/peer.go
View file

@ -873,10 +873,13 @@ func (ps *peerSet) Register(p *peer) error {
ps.lock.Unlock()
return errAlreadyRegistered
}
if _, ok := ps.inactive[p.id]; ok {
delete(ps.inactive, p.id)
} else {
p.sendQueue = newExecQueue(100)
}
ps.active[p.id] = p
delete(ps.inactive, p.id)
p.sendQueue = newExecQueue(100)
peers := make([]peerSetNotify, len(ps.notifyList))
copy(peers, ps.notifyList)
ps.lock.Unlock()
@ -904,7 +907,6 @@ func (ps *peerSet) Unregister(p *peer) error {
for _, n := range peers {
n.unregisterPeer(p)
}
p.sendQueue.quit()
return nil
}
}
@ -913,17 +915,27 @@ func (ps *peerSet) Unregister(p *peer) error {
// initiates disconnection at the networking layer.
func (ps *peerSet) Disconnect(id string) error {
ps.lock.Lock()
p, ok := ps.active[id]
if ok {
delete(ps.active, id)
} else {
if p, ok = ps.inactive[id]; !ok {
ps.lock.Unlock()
return errNotRegistered
}
var (
peers []peerSetNotify
p *peer
ok bool
)
if p, ok = ps.active[id]; ok {
delete(ps.active, p.id)
peers = make([]peerSetNotify, len(ps.notifyList))
copy(peers, ps.notifyList)
} else if p, ok = ps.inactive[id]; ok {
delete(ps.inactive, id)
} else {
ps.lock.Unlock()
return errNotRegistered
}
ps.lock.Unlock()
for _, n := range peers {
n.unregisterPeer(p)
}
p.sendQueue.quit()
p.Peer.Disconnect(p2p.DiscUselessPeer)
return nil
}