status-im/nimbus-eth1
2
0
Fork 0
mirror of https://github.com/status-im/nimbus-eth1.git synced 2025-01-12 13:24:21 +00:00
Code Issues Projects Releases Wiki Activity

Fluffy: Fix broken portal hive tests (#2917)

Browse Source 
Fix bug in portal stream where connection id was not correctly generated when handling requests from peers.
This commit is contained in:
bhartnett 2024-12-06 23:53:15 +08:00 committed by GitHub
parent 9a9d391217
commit 17da64628a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fluffy/network/wire/portal_stream.nim
View File

@ -190,7 +190,8 @@ proc addContentOffer*(
var id = ConnectionId.fromBytesBE(connectionId)
# Generate a new id if already existing to avoid using a duplicate
if stream.contentOffers.contains(id):
# or if we happen to get an id of zero from the generator
if id == 0 or stream.contentOffers.contains(id):
stream.rng[].generate(connectionId)
id = ConnectionId.fromBytesBE(connectionId)
@ -212,12 +213,14 @@ proc addContentRequest*(
# TODO: Should we check if `NodeId` & `connectionId` combo already exists?
# What happens if we get duplicates?
var connectionId: Bytes2
stream.rng[].generate(connectionId)
# uTP protocol uses BE for all values in the header, incl. connection id.
var id = ConnectionId.fromBytesBE(connectionId)
# Generate a new id if already existing to avoid using a duplicate
if stream.contentRequests.contains(id):
# or if we happen to get an id of zero from the generator
if id == 0 or stream.contentRequests.contains(id):
stream.rng[].generate(connectionId)
id = ConnectionId.fromBytesBE(connectionId)