From 165d39738def9264156da9309e1d4c524fe499c8 Mon Sep 17 00:00:00 2001 From: Yuriy Glukhov Date: Wed, 13 Jan 2021 16:09:28 +0200 Subject: Check for errors after sendPendingSslData (#16696) * Check for errors after sendPendingSslData * Leftover comment removed --- lib/pure/asyncnet.nim | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'lib/pure') diff --git a/lib/pure/asyncnet.nim b/lib/pure/asyncnet.nim index 455efe1c1..b68fa533f 100644 --- a/lib/pure/asyncnet.nim +++ b/lib/pure/asyncnet.nim @@ -259,11 +259,9 @@ when defineSsl: ErrClearError() # Call the desired operation. opResult = op - # Bit hackish here. - # TODO: Introduce an async template transformation pragma? # Send any remaining pending SSL data. - yield sendPendingSslData(socket, flags) + await sendPendingSslData(socket, flags) # If the operation failed, try to see if SSL has some data to read # or write. @@ -321,10 +319,8 @@ template readInto(buf: pointer, size: int, socket: AsyncSocket, sslRead(socket.sslHandle, cast[cstring](buf), size.cint)) res = opResult else: - var recvIntoFut = asyncdispatch.recvInto(socket.fd.AsyncFD, buf, size, flags) - yield recvIntoFut # Not in SSL mode. - res = recvIntoFut.read() + res = await asyncdispatch.recvInto(socket.fd.AsyncFD, buf, size, flags) res template readIntoBuf(socket: AsyncSocket, -- cgit 1.4.1-2-gfad0