From 9198b44d3a44ee03fe9cdfe14d43ac614c53f88e Mon Sep 17 00:00:00 2001 From: kaiserd Date: Wed, 18 May 2022 08:50:51 +0000 Subject: [PATCH] deploy: 59b242fcad9fa86d6868bc8119fa2f2017f7f494 --- .../vendor/libbacktrace-upstream/libtool | 2 +- waku/v2/node/wakunode2.nim | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/vendor/nim-libbacktrace/vendor/libbacktrace-upstream/libtool b/vendor/nim-libbacktrace/vendor/libbacktrace-upstream/libtool index 89c93c796..5d736f440 100755 --- a/vendor/nim-libbacktrace/vendor/libbacktrace-upstream/libtool +++ b/vendor/nim-libbacktrace/vendor/libbacktrace-upstream/libtool @@ -2,7 +2,7 @@ # libtool - Provide generalized library-building support services. # Generated automatically by config.status (libbacktrace) version-unused -# Libtool was configured on host fv-az38-315: +# Libtool was configured on host fv-az457-860: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 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,