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

Add timeout to CONNECT, STREAM_OPEN.

This commit is contained in:
cheatfate 2018-11-23 12:16:35 +02:00
parent 9edc823b6c
commit 83c18a5906
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libp2p/daemon/daemonapi.nim
View File

@ -112,7 +112,8 @@ proc requestIdentity(): ProtoBuffer =
result.finish() result.finish()
proc requestConnect(peerid: PeerID, proc requestConnect(peerid: PeerID,
addresses: openarray[MultiAddress]): ProtoBuffer = addresses: openarray[MultiAddress],
timeout = 0): ProtoBuffer =
## https://github.com/libp2p/go-libp2p-daemon/blob/master/conn.go ## https://github.com/libp2p/go-libp2p-daemon/blob/master/conn.go
## Processing function `doConnect(req *pb.Request)`. ## Processing function `doConnect(req *pb.Request)`.
result = initProtoBuffer({WithVarintLength}) result = initProtoBuffer({WithVarintLength})
@ -120,6 +121,8 @@ proc requestConnect(peerid: PeerID,
msg.write(initProtoField(1, peerid)) msg.write(initProtoField(1, peerid))
for item in addresses: for item in addresses:
msg.write(initProtoField(2, item)) msg.write(initProtoField(2, item))
if timeout > 0:
msg.write(initProtoField(3, timeout))
result.write(initProtoField(1, cast[uint](RequestType.CONNECT))) result.write(initProtoField(1, cast[uint](RequestType.CONNECT)))
result.write(initProtoField(2, msg)) result.write(initProtoField(2, msg))
result.finish() result.finish()
@ -135,7 +138,8 @@ proc requestDisconnect(peerid: PeerID): ProtoBuffer =
result.finish() result.finish()
proc requestStreamOpen(peerid: PeerID, proc requestStreamOpen(peerid: PeerID,
protocols: openarray[string]): ProtoBuffer = protocols: openarray[string],
timeout = 0): ProtoBuffer =
## https://github.com/libp2p/go-libp2p-daemon/blob/master/conn.go ## https://github.com/libp2p/go-libp2p-daemon/blob/master/conn.go
## Processing function `doStreamOpen(req *pb.Request)`. ## Processing function `doStreamOpen(req *pb.Request)`.
result = initProtoBuffer({WithVarintLength}) result = initProtoBuffer({WithVarintLength})
@ -143,6 +147,8 @@ proc requestStreamOpen(peerid: PeerID,
msg.write(initProtoField(1, peerid)) msg.write(initProtoField(1, peerid))
for item in protocols: for item in protocols:
msg.write(initProtoField(2, item)) msg.write(initProtoField(2, item))
if timeout > 0:
msg.write(initProtoField(3, timeout))
result.write(initProtoField(1, cast[uint](RequestType.STREAM_OPEN))) result.write(initProtoField(1, cast[uint](RequestType.STREAM_OPEN)))
result.write(initProtoField(3, msg)) result.write(initProtoField(3, msg))
result.finish() result.finish()

2
libp2p/varint.nim
View File

@ -16,7 +16,7 @@
import bitops import bitops
type type
VarintStatus* = enum VarintStatus* {.pure.} = enum
Error, Error,
Success, Success,
Overflow, Overflow,