vacp2p
/
nim-libp2p
mirror of https://github.com/vacp2p/nim-libp2p.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

properly exit readLoop on error/stream end

This commit is contained in:
Dmitriy Ryajov 2019-09-28 13:55:48 -06:00
parent 34d1a641de
commit 968fd85d49
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libp2p/protocols/secure/secio.nim
View File

@ -402,8 +402,14 @@ proc handshake*(s: Secio, conn: Connection): Future[SecureConnection] {.async.}
proc readLoop(sconn: SecureConnection, stream: BufferStream) {.async.} = proc readLoop(sconn: SecureConnection, stream: BufferStream) {.async.} =
while not sconn.conn.closed: while not sconn.conn.closed:
try:
let msg = await sconn.readMessage() let msg = await sconn.readMessage()
await stream.pushTo(msg) await stream.pushTo(msg)
except:
trace "exception in secio", exc = getCurrentExceptionMsg()
return
finally:
trace "ending secio readLoop"
proc handleConn(s: Secio, conn: Connection): Future[Connection] {.async.} = proc handleConn(s: Secio, conn: Connection): Future[Connection] {.async.} =
var sconn = await s.handshake(conn) var sconn = await s.handshake(conn)
@ -419,9 +425,9 @@ proc handleConn(s: Secio, conn: Connection): Future[Connection] {.async.} =
method init(s: Secio) {.gcsafe.} = method init(s: Secio) {.gcsafe.} =
proc handle(conn: Connection, proto: string) {.async, gcsafe.} = proc handle(conn: Connection, proto: string) {.async, gcsafe.} =
debug "handling connection" trace "handling connection"
discard await s.handleConn(conn) discard await s.handleConn(conn)
debug "connection secured" trace "connection secured"
s.codec = SecioCodec s.codec = SecioCodec
s.handler = handle s.handler = handle