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

Return on getMessage failure and do address conversion afterwards

This commit is contained in:
kdeme 2020-06-30 15:33:33 +02:00
parent 9a467225fb
commit 23aa13b03d
No known key found for this signature in database
GPG Key ID: 4E8DD21420AF43F5
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
eth/p2p/discoveryv5/protocol.nim
View File

@ -411,15 +411,6 @@ proc processClient(transp: DatagramTransport, raddr: TransportAddress):
var ip: IpAddress var ip: IpAddress
var buf = newSeq[byte]() var buf = newSeq[byte]()
try:
ip = raddr.address()
except ValueError:
# This should not be possible considering we bind to an IP address.
error "Not a valid IpAddress"
return
let a = Address(ip: ValidIpAddress.init(ip), port: raddr.port)
try: try:
# TODO: should we use `peekMessage()` to avoid allocation? # TODO: should we use `peekMessage()` to avoid allocation?
# TODO: This can still raise general `Exception` while it probably should # TODO: This can still raise general `Exception` while it probably should
@ -428,11 +419,21 @@ proc processClient(transp: DatagramTransport, raddr: TransportAddress):
except TransportOsError as e: except TransportOsError as e:
# This is likely to be local network connection issues. # This is likely to be local network connection issues.
error "Transport getMessage error", exception = e.name, msg = e.msg error "Transport getMessage error", exception = e.name, msg = e.msg
return
except Exception as e: except Exception as e:
if e of Defect: if e of Defect:
raise (ref Defect)(e) raise (ref Defect)(e)
else: doAssert(false) else: doAssert(false)
try:
ip = raddr.address()
except ValueError:
# This should not be possible considering we bind to an IP address.
error "Not a valid IpAddress"
return
let a = Address(ip: ValidIpAddress.init(ip), port: raddr.port)
try: try:
proto.receive(a, buf) proto.receive(a, buf)
except Exception as e: except Exception as e: