Allow specifying local ip. And use any by default instead of loopback. (

#5635) * Allow specifying local ip. And use any by default instead of loopback. * Fix does not even start * Whitespace * Minor cleanup
NethermindEth · May 3, 2023 · 1c03616 · 1c03616
1 parent f6b1fa2
commit 1c03616
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 44 deletions.
diff --git a/src/Nethermind/Nethermind.Init/Steps/InitializeNetwork.cs b/src/Nethermind/Nethermind.Init/Steps/InitializeNetwork.cs
@@ -483,6 +483,7 @@ private async Task InitPeer()
             _api.MessageSerializationService,
             _api.NodeKey.PublicKey,
             _networkConfig.P2PPort,
+            _networkConfig.LocalIp,
             encryptionHandshakeServiceA,
             _api.SessionMonitor,
             _api.DisconnectsAnalyzer,

diff --git a/src/Nethermind/Nethermind.Network.Test/Rlpx/RlpxPeerTests.cs b/src/Nethermind/Nethermind.Network.Test/Rlpx/RlpxPeerTests.cs
@@ -24,7 +24,7 @@ public async Task Start_stop()
         {
             RlpxHost host = new(
                 Substitute.For<IMessageSerializationService>(),
-                TestItem.PublicKeyA, GegAvailableLocalPort(),
+                TestItem.PublicKeyA, GegAvailableLocalPort(), null,
                 Substitute.For<IHandshakeService>(),
                 Substitute.For<ISessionMonitor>(),
                 NullDisconnectsAnalyzer.Instance,

diff --git a/src/Nethermind/Nethermind.Network/IP/SocketIPSource.cs b/src/Nethermind/Nethermind.Network/IP/SocketIPSource.cs
diff --git a/src/Nethermind/Nethermind.Network/IPResolver.cs b/src/Nethermind/Nethermind.Network/IPResolver.cs
@@ -80,15 +80,14 @@ IEnumerable<IIPSource> GetIPSources()
                 if (_logger.IsError) _logger.Error("Error while getting external ip", e);
             }
 
-            return IPAddress.Loopback;
+            return IPAddress.Any;
         }
 
         private async Task<IPAddress> InitializeLocalIp()
         {
             IEnumerable<IIPSource> GetIPSources()
             {
                 yield return new NetworkConfigLocalIPSource(_networkConfig, _logManager);
-                yield return new SocketIPSource(_logManager);
             }
 
             try
@@ -107,7 +106,7 @@ IEnumerable<IIPSource> GetIPSources()
                 if (_logger.IsError) _logger.Error("Error while getting local ip", e);
             }
 
-            return IPAddress.Loopback;
+            return IPAddress.Any;
         }
     }
 }
diff --git a/src/Nethermind/Nethermind.Network/Rlpx/RlpxHost.cs b/src/Nethermind/Nethermind.Network/Rlpx/RlpxHost.cs
@@ -35,6 +35,7 @@ public class RlpxHost : IRlpxHost
         private bool _isInitialized;
         public PublicKey LocalNodeId { get; }
         public int LocalPort { get; }
+        public string? LocalIp { get; set; }
         private readonly IHandshakeService _handshakeService;
         private readonly IMessageSerializationService _serializationService;
         private readonly ILogManager _logManager;
@@ -47,6 +48,7 @@ public class RlpxHost : IRlpxHost
         public RlpxHost(IMessageSerializationService serializationService,
             PublicKey localNodeId,
             int localPort,
+            string? localIp,
             IHandshakeService handshakeService,
             ISessionMonitor sessionMonitor,
             IDisconnectsAnalyzer disconnectsAnalyzer,
@@ -78,6 +80,7 @@ TimeSpan sendLatency
             _handshakeService = handshakeService ?? throw new ArgumentNullException(nameof(handshakeService));
             LocalNodeId = localNodeId ?? throw new ArgumentNullException(nameof(localNodeId));
             LocalPort = localPort;
+            LocalIp = localIp;
             _sendLatency = sendLatency;
         }
 
@@ -109,7 +112,11 @@ public async Task Init()
                         InitializeChannel(ch, session);
                     }));
 
-                _bootstrapChannel = await bootstrap.BindAsync(LocalPort).ContinueWith(t =>
+                Task<IChannel> openTask = LocalIp is null
+                    ? bootstrap.BindAsync(LocalPort)
+                    : bootstrap.BindAsync(IPAddress.Parse(LocalIp), LocalPort);
+
+                _bootstrapChannel = await openTask.ContinueWith(t =>
                 {
                     if (t.IsFaulted)
                     {