waku-org/nwaku
1
0
Fork 0
mirror of https://github.com/waku-org/nwaku.git synced 2025-02-05 19:43:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(dns4name): dns4name + unset port resolved (#965)

Browse Source
This commit is contained in:
Daniel Kaiser 2022-05-18 10:15:03 +02:00 committed by GitHub
parent 41cdb8ba26
commit 59b242fcad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -193,7 +193,6 @@ proc new*(T: type WakuNode, nodeKey: crypto.PrivateKey,
if (dns4DomainName.isSome()): if (dns4DomainName.isSome()):
# Use dns4 for externally announced addresses # Use dns4 for externally announced addresses
hostExtAddress = some(dns4TcpEndPoint(dns4DomainName.get(), extPort.get())) hostExtAddress = some(dns4TcpEndPoint(dns4DomainName.get(), extPort.get()))
if (wsHostAddress.isSome()): if (wsHostAddress.isSome()):
@ -1089,17 +1088,18 @@ when isMainModule:
clientId, clientId,
Port(uint16(conf.tcpPort) + conf.portsShift), Port(uint16(conf.tcpPort) + conf.portsShift),
Port(uint16(udpPort) + conf.portsShift)) Port(uint16(udpPort) + conf.portsShift))
dns4DomainName = if conf.dns4DomainName != "": some(conf.dns4DomainName)
else: none(string)
## @TODO: the NAT setup assumes a manual port mapping configuration if extIp config is set. This probably ## @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 ## 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. ## config, the external port is the same as the bind port.
extPort = if extIp.isSome() and extTcpPort.isNone(): extPort = if (extIp.isSome() or dns4DomainName.isSome()) and extTcpPort.isNone():
some(Port(uint16(conf.tcpPort) + conf.portsShift)) some(Port(uint16(conf.tcpPort) + conf.portsShift))
else: else:
extTcpPort extTcpPort
dns4DomainName = if conf.dns4DomainName != "": some(conf.dns4DomainName)
else: none(string)
wakuFlags = initWakuFlags(conf.lightpush, wakuFlags = initWakuFlags(conf.lightpush,
conf.filter, conf.filter,
conf.store, conf.store,