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

Handle gracefully a pre-mature closing of a libp2p stream by another peer

This commit is contained in:
Zahary Karadjov 2019-09-11 11:01:36 -04:00
parent b5fad0c9e8
commit 37043f0d91
No known key found for this signature in database
GPG Key ID: C8936F8A3073D609
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
beacon_chain/libp2p_backend.nim
View File

@ -126,6 +126,10 @@ proc getPeer*(node: Eth2Node, peerId: PeerID): Peer {.gcsafe.} =
proc peerFromStream(daemon: DaemonAPI, stream: P2PStream): Peer {.gcsafe.} = proc peerFromStream(daemon: DaemonAPI, stream: P2PStream): Peer {.gcsafe.} =
Eth2Node(daemon.userData).getPeer(stream.peer) Eth2Node(daemon.userData).getPeer(stream.peer)
proc safeClose(stream: P2PStream) {.async.} =
if P2PStreamFlags.Closed notin stream.flags:
await close(stream)
proc disconnect*(peer: Peer, reason: DisconnectionReason, notifyOtherPeer = false) {.async.} = proc disconnect*(peer: Peer, reason: DisconnectionReason, notifyOtherPeer = false) {.async.} =
# TODO: How should we notify the other peer? # TODO: How should we notify the other peer?
if peer.connectionState notin {Disconnecting, Disconnected}: if peer.connectionState notin {Disconnecting, Disconnected}:
@ -327,7 +331,7 @@ proc sendNotificationMsg(peer: Peer, protocolId: string, requestBytes: Bytes) {.
let stream = streamFut.read let stream = streamFut.read
defer: defer:
await close(stream) await safeClose(stream)
var s = init OutputStream var s = init OutputStream
s.appendVarint requestBytes.len.uint64 s.appendVarint requestBytes.len.uint64
@ -407,7 +411,7 @@ proc makeEth2Request(peer: Peer, protocolId: string, requestBytes: Bytes,
let stream = streamFut.read let stream = streamFut.read
defer: defer:
await close(stream) await safeClose(stream)
# Send the request # Send the request
var s = init OutputStream var s = init OutputStream
@ -589,7 +593,7 @@ proc p2pProtocolBackendImpl*(p: P2PProtocol): Backend =
proc `thunkName`(`daemonVar`: `DaemonAPI`, proc `thunkName`(`daemonVar`: `DaemonAPI`,
`streamVar`: `P2PStream`) {.async, gcsafe.} = `streamVar`: `P2PStream`) {.async, gcsafe.} =
defer: defer:
`await` close(`streamVar`) `await` safeClose(`streamVar`)
let let
`deadlineVar` = sleepAsync RESP_TIMEOUT `deadlineVar` = sleepAsync RESP_TIMEOUT