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

Fix clean-up socket in FindContent on cancel (#1067)

Browse Source
This commit is contained in:
Kim De Mey 2022-04-20 18:46:00 +02:00 committed by GitHub
parent 991edc1711
commit 99eea47dff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -600,6 +600,11 @@ proc findContent*(p: PortalProtocol, dst: Node, contentKey: ByteList):
# validation is required, using a length prefix here might be beneficial for # validation is required, using a length prefix here might be beneficial for
# this. # this.
let readData = socket.read() let readData = socket.read()
readData.cancelCallback = proc(udate: pointer) {.gcsafe.} =
# In case this `findContent` gets cancelled while reading the data,
# send a FIN and clean up the socket.
socket.close()
if await readData.withTimeout(p.stream.readTimeout): if await readData.withTimeout(p.stream.readTimeout):
let content = readData.read let content = readData.read
await socket.destroyWait() await socket.destroyWait()
@ -930,7 +935,7 @@ proc contentLookup*(p: PortalProtocol, target: ByteList, targetId: UInt256):
closestNodes.del(closestNodes.high()) closestNodes.del(closestNodes.high())
of Content: of Content:
# cancel any pending queries as we have find the content # cancel any pending queries as the content has been found
for f in pendingQueries: for f in pendingQueries:
f.cancel() f.cancel()
portal_lookup_content_requests.observe(requestAmount) portal_lookup_content_requests.observe(requestAmount)