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

fix: return on read error

This commit is contained in:
Dmitriy Ryajov 2019-09-02 14:45:00 -06:00
parent 2c3c23c7c6
commit 5177bbb492
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libp2p/connection.nim
View File

@ -10,7 +10,7 @@
import chronos import chronos
import peerinfo, multiaddress, stream/lpstream, peerinfo, varint, vbuffer import peerinfo, multiaddress, stream/lpstream, peerinfo, varint, vbuffer
const DefaultReadSize: uint = 64*1024 const DefaultReadSize: uint = 64 * 1024
type type
Connection* = ref object of LPStream Connection* = ref object of LPStream
@ -27,32 +27,45 @@ method read*(s: Connection, n = -1): Future[seq[byte]] {.gcsafe.} =
method readExactly*(s: Connection, method readExactly*(s: Connection,
pbytes: pointer, pbytes: pointer,
nbytes: int): Future[void] {.gcsafe.} = nbytes: int):
Future[void] {.gcsafe.} =
result = s.stream.readExactly(pbytes, nbytes) result = s.stream.readExactly(pbytes, nbytes)
method readLine*(s: Connection, method readLine*(s: Connection,
limit = 0, limit = 0,
sep = "\r\n"): Future[string] {.gcsafe.} = sep = "\r\n"):
Future[string] {.gcsafe.} =
result = s.stream.readLine(limit, sep) result = s.stream.readLine(limit, sep)
method readOnce*(s: Connection, method readOnce*(s: Connection,
pbytes: pointer, pbytes: pointer,
nbytes: int): Future[int] {.gcsafe.} = nbytes: int):
Future[int] {.gcsafe.} =
result = s.stream.readOnce(pbytes, nbytes) result = s.stream.readOnce(pbytes, nbytes)
method readUntil*(s: Connection, method readUntil*(s: Connection,
pbytes: pointer, pbytes: pointer,
nbytes: int, nbytes: int,
sep: seq[byte]): Future[int] {.gcsafe.} = sep: seq[byte]):
Future[int] {.gcsafe.} =
result = s.stream.readUntil(pbytes, nbytes, sep) result = s.stream.readUntil(pbytes, nbytes, sep)
method write*(s: Connection, pbytes: pointer, nbytes: int): Future[void] {.gcsafe.} = method write*(s: Connection,
pbytes: pointer,
nbytes: int):
Future[void] {.gcsafe.} =
result = s.stream.write(pbytes, nbytes) result = s.stream.write(pbytes, nbytes)
method write*(s: Connection, msg: string, msglen = -1): Future[void] {.gcsafe.} = method write*(s: Connection,
msg: string,
msglen = -1):
Future[void] {.gcsafe.} =
result = s.stream.write(msg, msglen) result = s.stream.write(msg, msglen)
method write*(s: Connection, msg: seq[byte], msglen = -1): Future[void] {.gcsafe.} = method write*(s: Connection,
msg: seq[byte],
msglen = -1):
Future[void] {.gcsafe.} =
result = s.stream.write(msg, msglen) result = s.stream.write(msg, msglen)
method close*(s: Connection) {.async, gcsafe.} = method close*(s: Connection) {.async, gcsafe.} =
@ -74,6 +87,8 @@ proc readLp*(s: Connection): Future[seq[byte]] {.async, gcsafe.} =
break break
if res != VarintStatus.Success or size > DefaultReadSize: if res != VarintStatus.Success or size > DefaultReadSize:
buffer.setLen(0) buffer.setLen(0)
result = buffer
return
buffer.setLen(size) buffer.setLen(size)
await s.readExactly(addr buffer[0], int(size)) await s.readExactly(addr buffer[0], int(size))
except TransportIncompleteError: except TransportIncompleteError: