waku-org/nwaku
1
0
Fork 0
mirror of https://github.com/waku-org/nwaku.git synced 2025-02-10 14:06:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prefer announced addrs in listenStr (#348)

Browse Source 
* Prefer announced addrs in listenStr
This commit is contained in:
Hanno Cornelius 2021-01-15 09:37:20 +02:00 committed by GitHub
parent cc1fc15d38
commit 76c0d2b839
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/v2/test_jsonrpc_waku.nim
View File

@ -59,7 +59,7 @@ procSuite "Waku v2 JSON-RPC API":
let response = await client.get_waku_v2_debug_v1_info() let response = await client.get_waku_v2_debug_v1_info()
check: check:
response.listenStr == $node.peerInfo.addrs[0] & "/p2p/" & $node.peerInfo.peerId response.listenStr == $node.peerInfo.addrs[^1] & "/p2p/" & $node.peerInfo.peerId
server.stop() server.stop()
server.close() server.close()

15
waku/v2/node/wakunode2.nim
View File

@ -120,7 +120,9 @@ proc init*(T: type WakuNode, nodeKey: crypto.PrivateKey,
info "Initializing networking", hostAddress, info "Initializing networking", hostAddress,
announcedAddresses announcedAddresses
# XXX: Add this when we create node or start it? # XXX: Add this when we create node or start it?
peerInfo.addrs.add(hostAddress) peerInfo.addrs.add(hostAddress) # Index 0
for multiaddr in announcedAddresses:
peerInfo.addrs.add(multiaddr) # Announced addresses in index > 0
var switch = newStandardSwitch(some(nodekey), hostAddress, var switch = newStandardSwitch(some(nodekey), hostAddress,
transportFlags = {ServerFlags.ReuseAddr}, rng = rng) transportFlags = {ServerFlags.ReuseAddr}, rng = rng)
@ -149,7 +151,7 @@ proc start*(node: WakuNode) {.async.} =
# TODO Get this from WakuNode obj # TODO Get this from WakuNode obj
let peerInfo = node.peerInfo let peerInfo = node.peerInfo
info "PeerInfo", peerId = peerInfo.peerId, addrs = peerInfo.addrs info "PeerInfo", peerId = peerInfo.peerId, addrs = peerInfo.addrs
let listenStr = $peerInfo.addrs[0] & "/p2p/" & $peerInfo.peerId let listenStr = $peerInfo.addrs[^1] & "/p2p/" & $peerInfo.peerId
## XXX: this should be /ip4..., / stripped? ## XXX: this should be /ip4..., / stripped?
info "Listening on", full = listenStr info "Listening on", full = listenStr
@ -259,7 +261,7 @@ proc info*(node: WakuNode): WakuInfo =
# TODO Generalize this for other type of multiaddresses # TODO Generalize this for other type of multiaddresses
let peerInfo = node.peerInfo let peerInfo = node.peerInfo
let listenStr = $peerInfo.addrs[0] & "/p2p/" & $peerInfo.peerId let listenStr = $peerInfo.addrs[^1] & "/p2p/" & $peerInfo.peerId
let wakuInfo = WakuInfo(listenStr: listenStr) let wakuInfo = WakuInfo(listenStr: listenStr)
return wakuInfo return wakuInfo
@ -455,8 +457,13 @@ when isMainModule:
(extIp, extTcpPort, extUdpPort) = setupNat(conf.nat, clientId, (extIp, extTcpPort, extUdpPort) = setupNat(conf.nat, clientId,
Port(uint16(conf.tcpPort) + conf.portsShift), Port(uint16(conf.tcpPort) + conf.portsShift),
Port(uint16(conf.udpPort) + conf.portsShift)) Port(uint16(conf.udpPort) + conf.portsShift))
## @TODO: the NAT setup assumes a manual port mapping configuration if extIp config is set. This probably
## implies adding manual config item for extPort as well. The following heuristic assumes that, in absence of manual
## config, the external port is the same as the bind port.
extPort = if extIp.isSome() and extTcpPort.isNone(): some(Port(uint16(conf.tcpPort) + conf.portsShift))
else: extTcpPort
node = WakuNode.init(conf.nodeKey, conf.listenAddress, node = WakuNode.init(conf.nodeKey, conf.listenAddress,
Port(uint16(conf.tcpPort) + conf.portsShift), extIp, extTcpPort) Port(uint16(conf.tcpPort) + conf.portsShift), extIp, extPort)
waitFor node.start() waitFor node.start()