mirror of https://github.com/status-im/nim-eth.git
Add option to set specific protocol for observer
This commit is contained in:
parent
31290b6b35
commit
7cdd31e982
|
@ -331,13 +331,12 @@ proc onPeerDisconnected(ctx: SyncContext, p: Peer) =
|
|||
proc startSync(ctx: SyncContext) =
|
||||
var po: PeerObserver
|
||||
po.onPeerConnected = proc(p: Peer) {.gcsafe.} =
|
||||
if p.supports(eth):
|
||||
ctx.onPeerConnected(p)
|
||||
|
||||
po.onPeerDisconnected = proc(p: Peer) {.gcsafe.} =
|
||||
if p.supports(eth):
|
||||
ctx.onPeerDisconnected(p)
|
||||
|
||||
po.setProtocol eth
|
||||
ctx.peerPool.addObserver(ctx, po)
|
||||
|
||||
proc findBestPeer(node: EthereumNode): (Peer, DifficultyInt) =
|
||||
|
|
|
@ -35,6 +35,7 @@ proc addObserver(p: PeerPool, observerId: int, observer: PeerObserver) =
|
|||
p.observers[observerId] = observer
|
||||
if not observer.onPeerConnected.isNil:
|
||||
for peer in p.connectedNodes.values:
|
||||
if observer.protocol.isNil or peer.supports(observer.protocol):
|
||||
observer.onPeerConnected(peer)
|
||||
|
||||
proc delObserver(p: PeerPool, observerId: int) =
|
||||
|
@ -46,6 +47,9 @@ proc addObserver*(p: PeerPool, observerId: ref, observer: PeerObserver) {.inline
|
|||
proc delObserver*(p: PeerPool, observerId: ref) {.inline.} =
|
||||
p.delObserver(cast[int](observerId))
|
||||
|
||||
template setProtocol*(observer: PeerObserver, Protocol: type) =
|
||||
observer.protocol = Protocol.protocolInfo
|
||||
|
||||
proc stopAllPeers(p: PeerPool) {.async.} =
|
||||
debug "Stopping all peers ..."
|
||||
# TODO: ...
|
||||
|
@ -108,6 +112,7 @@ proc addPeer*(pool: PeerPool, peer: Peer): bool =
|
|||
pool.connectedNodes[peer.remote] = peer
|
||||
for o in pool.observers.values:
|
||||
if not o.onPeerConnected.isNil:
|
||||
if o.protocol.isNil or peer.supports(o.protocol):
|
||||
o.onPeerConnected(peer)
|
||||
return true
|
||||
else: return false
|
||||
|
|
|
@ -59,6 +59,7 @@ type
|
|||
PeerObserver* = object
|
||||
onPeerConnected*: proc(p: Peer) {.gcsafe.}
|
||||
onPeerDisconnected*: proc(p: Peer) {.gcsafe.}
|
||||
protocol*: ProtocolInfo
|
||||
|
||||
Capability* = object
|
||||
name*: string
|
||||
|
|
|
@ -227,9 +227,6 @@ proc registerProtocol(protocol: ProtocolInfo) =
|
|||
# Message composition and encryption
|
||||
#
|
||||
|
||||
template protocolOffset(peer: Peer, Protocol: type): int =
|
||||
peer.dispatcher.protocolOffsets[Protocol.protocolInfo.index]
|
||||
|
||||
proc perPeerMsgIdImpl(peer: Peer, proto: ProtocolInfo, msgId: int): int {.inline.} =
|
||||
result = msgId
|
||||
if not peer.dispatcher.isNil:
|
||||
|
@ -239,9 +236,12 @@ template getPeer(peer: Peer): auto = peer
|
|||
template getPeer(response: Response): auto = Peer(response)
|
||||
template getPeer(response: ResponseWithId): auto = response.peer
|
||||
|
||||
proc supports*(peer: Peer, proto: ProtocolInfo): bool {.inline.} =
|
||||
peer.dispatcher.protocolOffsets[proto.index] != -1
|
||||
|
||||
proc supports*(peer: Peer, Protocol: type): bool {.inline.} =
|
||||
## Checks whether a Peer supports a particular protocol
|
||||
peer.protocolOffset(Protocol) != -1
|
||||
peer.supports(Protocol.protocolInfo)
|
||||
|
||||
template perPeerMsgId(peer: Peer, MsgType: type): int =
|
||||
perPeerMsgIdImpl(peer, MsgType.msgProtocol.protocolInfo, MsgType.msgId)
|
||||
|
@ -1124,6 +1124,7 @@ proc removePeer(network: EthereumNode, peer: Peer) =
|
|||
|
||||
for observer in network.peerPool.observers.values:
|
||||
if not observer.onPeerDisconnected.isNil:
|
||||
if observer.protocol.isNil or peer.supports(observer.protocol):
|
||||
observer.onPeerDisconnected(peer)
|
||||
|
||||
proc callDisconnectHandlers(peer: Peer, reason: DisconnectionReason): Future[void] =
|
||||
|
|
Loading…
Reference in New Issue