status-im
/
nim-libp2p
mirror of https://github.com/status-im/nim-libp2p.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

don't return nil in dial (#205) 

* dont return nil in dial

* don't crash on pubsub send
This commit is contained in:
Dmitriy Ryajov 2020-06-05 18:17:05 -06:00 committed by GitHub
parent 2aebae56c0
commit 130c64f33a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libp2p.nimble
View File

@ -14,7 +14,7 @@ requires "nim >= 1.2.0",
"chronos >= 2.3.8", "chronos >= 2.3.8",
"metrics", "metrics",
"secp256k1", "secp256k1",
"stew" "stew >= 0.1.0"
proc runTest(filename: string, verify: bool = true, sign: bool = true) = proc runTest(filename: string, verify: bool = true, sign: bool = true) =
var excstr: string = "nim c -r --opt:speed -d:debug --verbosity:0 --hints:off" var excstr: string = "nim c -r --opt:speed -d:debug --verbosity:0 --hints:off"

14
libp2p/protocols/pubsub/pubsubpeer.nim
View File

@ -48,8 +48,9 @@ proc isConnected*(p: PubSubPeer): bool =
proc `conn=`*(p: PubSubPeer, conn: Connection) = proc `conn=`*(p: PubSubPeer, conn: Connection) =
trace "attaching send connection for peer", peer = p.id trace "attaching send connection for peer", peer = p.id
p.sendConn = conn if not(isNil(conn)):
p.onConnect.fire() p.sendConn = conn
p.onConnect.fire()
proc recvObservers(p: PubSubPeer, msg: var RPCMsg) = proc recvObservers(p: PubSubPeer, msg: var RPCMsg) =
# trigger hooks # trigger hooks
@ -113,10 +114,11 @@ proc send*(p: PubSubPeer, msgs: seq[RPCMsg]) {.async.} =
trace "about to send message", peer = p.id, trace "about to send message", peer = p.id,
encoded = digest encoded = digest
await p.onConnect.wait() await p.onConnect.wait()
trace "sending encoded msgs to peer", peer = p.id, if p.isConnected: # this can happen if the remote disconnected
encoded = encoded.buffer.shortLog trace "sending encoded msgs to peer", peer = p.id,
await p.sendConn.writeLp(encoded.buffer) encoded = encoded.buffer.shortLog
p.sentRpcCache.put(digest) await p.sendConn.writeLp(encoded.buffer)
p.sentRpcCache.put(digest)
except CatchableError as exc: except CatchableError as exc:
trace "unable to send to remote", exc = exc.msg trace "unable to send to remote", exc = exc.msg
p.sendConn = nil p.sendConn = nil

3
libp2p/switch.nim
View File

@ -282,8 +282,7 @@ proc dial*(s: Switch,
trace "Attempting to select remote", proto = proto trace "Attempting to select remote", proto = proto
if not await s.ms.select(result, proto): if not await s.ms.select(result, proto):
warn "Unable to select sub-protocol", proto = proto raise newException(CatchableError, "Unable to select sub-protocol " & proto)
return nil
proc mount*[T: LPProtocol](s: Switch, proto: T) {.gcsafe.} = proc mount*[T: LPProtocol](s: Switch, proto: T) {.gcsafe.} =
if isNil(proto.handler): if isNil(proto.handler):