From e16dcef9ee5bdece3487cebf3b795c5e8fe9d4ef Mon Sep 17 00:00:00 2001
From: Hanno Cornelius <68783915+jm-clius@users.noreply.github.com>
Date: Mon, 30 Aug 2021 11:01:28 +0200
Subject: [PATCH] Fix announced addresses (#710)

---
 examples/v2/matterbridge/chat2bridge.nim | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/examples/v2/matterbridge/chat2bridge.nim b/examples/v2/matterbridge/chat2bridge.nim
index d59d496c5..2cee50b21 100644
--- a/examples/v2/matterbridge/chat2bridge.nim
+++ b/examples/v2/matterbridge/chat2bridge.nim
@@ -243,6 +243,12 @@ when isMainModule:
     (nodev2ExtIp, nodev2ExtPort, _) = setupNat(conf.nat, clientId,
                                                Port(uint16(conf.libp2pTcpPort) + conf.portsShift),
                                                Port(uint16(conf.udpPort) + conf.portsShift))
+    ## The following heuristic assumes that, in absence of manual
+    ## config, the external port is the same as the bind port.
+    extPort = if nodev2ExtIp.isSome() and nodev2ExtPort.isNone():
+                some(Port(uint16(conf.libp2pTcpPort) + conf.portsShift))
+              else:
+                nodev2ExtPort
 
   let
     bridge = Chat2Matterbridge.new(
@@ -250,7 +256,7 @@ when isMainModule:
                             mbGateway = conf.mbGateway,
                             nodev2Key = conf.nodekey,
                             nodev2BindIp = conf.listenAddress, nodev2BindPort = Port(uint16(conf.libp2pTcpPort) + conf.portsShift),
-                            nodev2ExtIp = nodev2ExtIp, nodev2ExtPort = nodev2ExtPort,
+                            nodev2ExtIp = nodev2ExtIp, nodev2ExtPort = extPort,
                             contentTopic = conf.contentTopic)
   
   waitFor bridge.start()