fix returned discoveryPort which will be needed for port forwarding

Signed-off-by: Daan Poron <[email protected]>
hyperledger · Feb 21, 2024 · e6c3eee · e6c3eee
1 parent c2c87cc
commit e6c3eee
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/...eum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryAgent.java b/...eum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryAgent.java
@@ -163,26 +163,27 @@ public CompletableFuture<Integer> start(final int tcpPort) {
           .thenApply(
               (InetSocketAddress localAddress) -> {
                 // Once listener is set up, finish initializing
-                final int discoveryPort =
+                final int localDiscoveryPort = localAddress.getPort();
+                final int externalDiscoveryPort =
                     natService
                         .getPortMapping(NatServiceType.DISCOVERY, NetworkProtocol.UDP)
                         .map(NatPortMapping::getExternalPort)
-                        .orElseGet(localAddress::getPort);
+                        .orElse(localDiscoveryPort);
 
                 final DiscoveryPeer ourNode =
                     DiscoveryPeer.fromEnode(
                         EnodeURLImpl.builder()
                             .nodeId(id)
                             .ipAddress(advertisedAddress)
                             .listeningPort(tcpPort)
-                            .discoveryPort(discoveryPort)
+                            .discoveryPort(externalDiscoveryPort)
                             .build());
                 this.localNode = Optional.of(ourNode);
                 isActive = true;
                 LOG.info("P2P peer discovery agent started and listening on {}", localAddress);
                 updateNodeRecord();
                 startController(ourNode);
-                return discoveryPort;
+                return localDiscoveryPort;
               });
     } else {
       this.isActive = false;

diff --git a/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/DefaultP2PNetwork.java b/ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/network/DefaultP2PNetwork.java
@@ -50,6 +50,7 @@
 import org.hyperledger.besu.nat.NatMethod;
 import org.hyperledger.besu.nat.NatService;
 import org.hyperledger.besu.nat.core.NatManager;
+import org.hyperledger.besu.nat.core.domain.NatPortMapping;
 import org.hyperledger.besu.nat.core.domain.NatServiceType;
 import org.hyperledger.besu.nat.core.domain.NetworkProtocol;
 import org.hyperledger.besu.nat.upnp.UpnpNatManager;
@@ -469,13 +470,17 @@ private void setLocalNode(
 
     // override advertised host if we detect an external IP address via NAT manager
     final String advertisedAddress = natService.queryExternalIPAddress(address);
+    final int advertisedDiscoveryPort = natService
+            .getPortMapping(NatServiceType.DISCOVERY, NetworkProtocol.UDP)
+            .map(NatPortMapping::getExternalPort)
+            .orElse(discoveryPort);
 
     final EnodeURL localEnode =
         EnodeURLImpl.builder()
             .nodeId(nodeId)
             .ipAddress(advertisedAddress)
             .listeningPort(listeningPort)
-            .discoveryPort(discoveryPort)
+            .discoveryPort(advertisedDiscoveryPort)
             .build();
 
     LOG.info("Enode URL {}", localEnode.toString());