From e76c120d4d6cf6a732e6ee120cef4cbe26bf1114 Mon Sep 17 00:00:00 2001 From: Daniel Kaiser Date: Wed, 18 May 2022 10:15:03 +0200 Subject: [PATCH] fix(dns4name): dns4name + unset port resolved (#965) --- waku/v2/node/wakunode2.nim | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/waku/v2/node/wakunode2.nim b/waku/v2/node/wakunode2.nim index 2c709a037..3e7c44f11 100644 --- a/waku/v2/node/wakunode2.nim +++ b/waku/v2/node/wakunode2.nim @@ -193,7 +193,6 @@ proc new*(T: type WakuNode, nodeKey: crypto.PrivateKey, if (dns4DomainName.isSome()): # Use dns4 for externally announced addresses - hostExtAddress = some(dns4TcpEndPoint(dns4DomainName.get(), extPort.get())) if (wsHostAddress.isSome()): @@ -1089,17 +1088,18 @@ when isMainModule: clientId, Port(uint16(conf.tcpPort) + 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 ## 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(): + extPort = if (extIp.isSome() or dns4DomainName.isSome()) and extTcpPort.isNone(): some(Port(uint16(conf.tcpPort) + conf.portsShift)) else: extTcpPort - dns4DomainName = if conf.dns4DomainName != "": some(conf.dns4DomainName) - else: none(string) - wakuFlags = initWakuFlags(conf.lightpush, conf.filter, conf.store,