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

Add/update some debugging info

This commit is contained in:
kdeme 2019-07-03 18:26:27 +02:00
parent 13a32811aa
commit 934a247c23
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
eth/p2p/rlpx.nim
View File

@ -23,7 +23,7 @@ type
const const
devp2pVersion* = 4 devp2pVersion* = 4
maxMsgSize = 1024 * 1024 maxMsgSize = 1024 * 1024
HandshakeTimeout = BreachOfProtocol HandshakeTimeout = MessageTimeout
include p2p_tracing include p2p_tracing
@ -429,12 +429,11 @@ proc checkedRlpRead(peer: Peer, r: var Rlp, MsgType: type): auto {.inline.} =
try: try:
return r.read(MsgType) return r.read(MsgType)
except: except:
# echo "Failed rlp.read:", tmp.inspect
debug "Failed rlp.read", debug "Failed rlp.read",
peer = peer, peer = peer,
msg = MsgType.name, dataType = MsgType.name,
exception = getCurrentExceptionMsg() exception = getCurrentExceptionMsg()
# dataHex = r.rawData.toSeq().toHex() # rlpData = r.inspect
raise raise
@ -455,6 +454,7 @@ proc waitSingleMsg(peer: Peer, MsgType: type): Future[MsgType] {.async.} =
elif nextMsgId == 1: # p2p.disconnect elif nextMsgId == 1: # p2p.disconnect
let reason = DisconnectionReason nextMsgData.listElem(0).toInt(uint32) let reason = DisconnectionReason nextMsgData.listElem(0).toInt(uint32)
await peer.disconnect(reason) await peer.disconnect(reason)
trace "disconnect message received in waitSingleMsg", reason, peer
raisePeerDisconnected("Unexpected disconnect", reason) raisePeerDisconnected("Unexpected disconnect", reason)
else: else:
warn "Dropped RLPX message", warn "Dropped RLPX message",
@ -509,6 +509,7 @@ proc dispatchMessages*(peer: Peer) {.async.} =
if msgId == 1: # p2p.disconnect if msgId == 1: # p2p.disconnect
let reason = msgData.listElem(0).toInt(uint32).DisconnectionReason let reason = msgData.listElem(0).toInt(uint32).DisconnectionReason
trace "disconnect message received in dispatchMessages", reason, peer
await peer.disconnect(reason, false) await peer.disconnect(reason, false)
break break
@ -1004,13 +1005,19 @@ proc rlpxConnect*(node: EthereumNode, remote: Node): Future[Peer] {.async.} =
if not validatePubKeyInHello(response, remote.node.pubKey): if not validatePubKeyInHello(response, remote.node.pubKey):
warn "Remote nodeId is not its public key" # XXX: Do we care? warn "Remote nodeId is not its public key" # XXX: Do we care?
trace "devp2p handshake completed", peer = remote,
clientId = response.clientId
await postHelloSteps(result, response) await postHelloSteps(result, response)
ok = true ok = true
trace "Peer fully connected", peer = remote, clientId = response.clientId
except PeerDisconnected as e: except PeerDisconnected as e:
if e.reason == AlreadyConnected or e.reason == TooManyPeers: case e.reason
trace "Disconnect during rlpxAccept", reason = e.reason of AlreadyConnected, TooManyPeers, MessageTimeout:
trace "Disconnect during rlpxConnect", reason = e.reason, peer = remote
else: else:
debug "Unexpected disconnect during rlpxAccept", reason = e.reason debug "Unexpected disconnect during rlpxConnect", reason = e.reason,
msg = e.msg, peer = remote
except TransportIncompleteError: except TransportIncompleteError:
trace "Connection dropped in rlpxConnect", remote trace "Connection dropped in rlpxConnect", remote
except UselessPeerError: except UselessPeerError:
@ -1086,6 +1093,8 @@ proc rlpxAccept*(node: EthereumNode,
result.waitSingleMsg(devp2p.hello), result.waitSingleMsg(devp2p.hello),
10.seconds) 10.seconds)
trace "Received Hello", version=response.version, id=response.clientId
if not validatePubKeyInHello(response, handshake.remoteHPubkey): if not validatePubKeyInHello(response, handshake.remoteHPubkey):
warn "A Remote nodeId is not its public key" # XXX: Do we care? warn "A Remote nodeId is not its public key" # XXX: Do we care?
@ -1094,6 +1103,9 @@ proc rlpxAccept*(node: EthereumNode,
udpPort: remote.port) udpPort: remote.port)
result.remote = newNode(initEnode(handshake.remoteHPubkey, address)) result.remote = newNode(initEnode(handshake.remoteHPubkey, address))
trace "devp2p handshake completed", peer = result.remote,
clientId = response.clientId
# In case there is an outgoing connection started with this peer we give # In case there is an outgoing connection started with this peer we give
# precedence to that one and we disconnect here with `AlreadyConnected` # precedence to that one and we disconnect here with `AlreadyConnected`
if result.remote in node.peerPool.connectedNodes or if result.remote in node.peerPool.connectedNodes or
@ -1106,11 +1118,14 @@ proc rlpxAccept*(node: EthereumNode,
await postHelloSteps(result, response) await postHelloSteps(result, response)
ok = true ok = true
trace "Peer fully connected", peer = result.remote, clientId = response.clientId
except PeerDisconnected as e: except PeerDisconnected as e:
if e.reason == AlreadyConnected or e.reason == TooManyPeers: case e.reason
trace "Disconnect during rlpxAccept", reason = e.reason of AlreadyConnected, TooManyPeers, MessageTimeout:
trace "Disconnect during rlpxAccept", reason = e.reason, peer = result.remote
else: else:
debug "Unexpected disconnect during rlpxAccept", reason = e.reason debug "Unexpected disconnect during rlpxAccept", reason = e.reason,
msg = e.msg, peer = result.remote
except TransportIncompleteError: except TransportIncompleteError:
trace "Connection dropped in rlpxAccept", remote = result.remote trace "Connection dropped in rlpxAccept", remote = result.remote
except UselessPeerError: except UselessPeerError: