status-im
/
nimbus-eth2
mirror of https://github.com/status-im/nimbus-eth2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

filter out `nil` values when iterating peers 

Iterating peers should only yield peers present in registry, otherwise
`nil` pointers are returned and depending on comparison function it will
break, see #6149.
This commit is contained in:
Etan Kissling 2024-03-28 01:38:49 +01:00
parent 885989f3df
commit 95aed2b220
No known key found for this signature in database
GPG Key ID: B21DA824C5A3D03D
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
beacon_chain/networking/peer_pool.nim
View File

@ -652,12 +652,12 @@ iterator peers*[A, B](pool: PeerPool[A, B],
## All peers will be sorted by equation `>`(Peer1, Peer2), so biggest values
## will be first.
var sorted = initHeapQueue[PeerIndex]()
for i in 0 ..< len(pool.storage):
if pool.storage[i].peerType in filter:
sorted.push(PeerIndex(data: i, cmp: pool.cmp))
for peerIdx in pool.registry.values():
if pool.storage[peerIdx.data].peerType in filter:
sorted.push(peerIdx)
while len(sorted) > 0:
let pindex = sorted.pop().data
yield pool.storage[pindex].data
let peerIdx = sorted.pop()
yield pool.storage[peerIdx.data].data
iterator availablePeers*[A, B](pool: PeerPool[A, B],
filter = {PeerType.Incoming,
@ -667,13 +667,13 @@ iterator availablePeers*[A, B](pool: PeerPool[A, B],
## All peers will be sorted by equation `>`(Peer1, Peer2), so biggest values
## will be first.
var sorted = initHeapQueue[PeerIndex]()
for i in 0 ..< len(pool.storage):
if (PeerFlags.Acquired notin pool.storage[i].flags) and
(pool.storage[i].peerType in filter):
sorted.push(PeerIndex(data: i, cmp: pool.cmp))
for peerIdx in pool.registry.values():
if (PeerFlags.Acquired notin pool.storage[peerIdx.data].flags) and
(pool.storage[peerIdx.data].peerType in filter):
sorted.push(peerIdx)
while len(sorted) > 0:
let pindex = sorted.pop().data
yield pool.storage[pindex].data
let peerIdx = sorted.pop()
yield pool.storage[peerIdx.data].data
iterator acquiredPeers*[A, B](pool: PeerPool[A, B],
filter = {PeerType.Incoming,
@ -683,13 +683,13 @@ iterator acquiredPeers*[A, B](pool: PeerPool[A, B],
## All peers will be sorted by equation `>`(Peer1, Peer2), so biggest values
## will be first.
var sorted = initHeapQueue[PeerIndex]()
for i in 0 ..< len(pool.storage):
if (PeerFlags.Acquired in pool.storage[i].flags) and
(pool.storage[i].peerType in filter):
sorted.push(PeerIndex(data: i, cmp: pool.cmp))
for peerIdx in pool.registry.values():
if (PeerFlags.Acquired in pool.storage[peerIdx.data].flags) and
(pool.storage[peerIdx.data].peerType in filter):
sorted.push(peerIdx)
while len(sorted) > 0:
let pindex = sorted.pop().data
yield pool.storage[pindex].data
let peerIdx = sorted.pop()
yield pool.storage[peerIdx.data].data
proc `[]`*[A, B](pool: PeerPool[A, B], key: B): A {.inline, raises: [KeyError].} =
## Retrieve peer with key ``key`` from PeerPool ``pool``.