jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check for errors after sendPendingSslData (#16696)

Browse source 
* Check for errors after sendPendingSslData

* Leftover comment removed
This commit is contained in:
Yuriy Glukhov 2021-01-13 16:09:28 +02:00 • committed by GitHub
commit 165d39738d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lib/pure/asyncnet.nim
View file

@ -259,11 +259,9 @@ when defineSsl:
ErrClearError() ErrClearError()
# Call the desired operation. # Call the desired operation.
opResult = op opResult = op
# Bit hackish here.
# TODO: Introduce an async template transformation pragma?
# Send any remaining pending SSL data. # 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 # If the operation failed, try to see if SSL has some data to read
# or write. # or write.
@ -321,10 +319,8 @@ template readInto(buf: pointer, size: int, socket: AsyncSocket,
sslRead(socket.sslHandle, cast[cstring](buf), size.cint)) sslRead(socket.sslHandle, cast[cstring](buf), size.cint))
res = opResult res = opResult
else: else:
var recvIntoFut = asyncdispatch.recvInto(socket.fd.AsyncFD, buf, size, flags)
yield recvIntoFut
# Not in SSL mode. # Not in SSL mode.
res = recvIntoFut.read() res = await asyncdispatch.recvInto(socket.fd.AsyncFD, buf, size, flags)
res res
template readIntoBuf(socket: AsyncSocket, template readIntoBuf(socket: AsyncSocket,