Use P2P 'from' host when parsing incoming P2P packets, if it is present

Signed-off-by: Matthew Whitehead <[email protected]>

ethereum/p2p/src/main/java/org/hyperledger/besu/ethereum/p2p/discovery/PeerDiscoveryAgent.java

@@ -282,8 +282,16 @@ protected void handleIncomingPacket(final Endpoint sourceEndpoint, final Packet
             .flatMap(Endpoint::getTcpPort)
             .orElse(udpPort);
 
+    // If the host is present in the P2P packet itself, use that as the endpoint. Otherwise
+    // take it from the UDP packet source IP.
+    final String host =
+        packet
+            .getPacketData(PingPacketData.class)
+            .flatMap(PingPacketData::getFrom)
+            .map(Endpoint::getHost)
+            .orElse(sourceEndpoint.getHost());
+
     // Notify the peer controller.
-    final String host = sourceEndpoint.getHost();
     final DiscoveryPeer peer =
         DiscoveryPeer.fromEnode(
             EnodeURLImpl.builder()

gradle.properties

@@ -1,4 +1,4 @@
-version=23.10.2-RC1
+version=23.10.2-SNAPSHOT
 
 org.gradle.welcome=never
 # Set exports/opens flags required by Google Java Format and ErrorProne plugins. (JEP-396)