Add listener readiness handling

NethermindEth · Oct 12, 2023 · 4efe0fc · 4efe0fc
1 parent c7caeac
commit 4efe0fc
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 10 deletions.
diff --git a/src/libp2p/Libp2p.Core/IPeerContext.cs b/src/libp2p/Libp2p.Core/IPeerContext.cs
@@ -23,9 +23,12 @@ public interface IPeerContext
     IChannelRequest? SpecificProtocolRequest { get; set; }
 
     event RemotePeerConnected OnRemotePeerConnection;
+    event ListenerReady OnListenerReady;
 
     void Connected(IPeer peer);
+    void ListenerReady();
     #endregion
 }
 
 public delegate void RemotePeerConnected(IRemotePeer peer);
+public delegate void ListenerReady();
diff --git a/src/libp2p/Libp2p.Core/PeerContext.cs b/src/libp2p/Libp2p.Core/PeerContext.cs
@@ -13,8 +13,6 @@ public class PeerContext : IPeerContext
     public Multiaddr RemoteEndpoint { get; set; }
     public Multiaddr LocalEndpoint { get; set; }
     public BlockingCollection<IChannelRequest> SubDialRequests { get; set; } = new();
-
-    public event RemotePeerConnected? OnRemotePeerConnection;
     public IChannelRequest? SpecificProtocolRequest { get; set; }
 
     public IPeerContext Fork()
@@ -24,8 +22,17 @@ public IPeerContext Fork()
         return result;
     }
 
+
+
+    public event RemotePeerConnected? OnRemotePeerConnection;
     public void Connected(IPeer peer)
     {
         OnRemotePeerConnection?.Invoke((IRemotePeer)peer);
     }
+
+    public event ListenerReady? OnListenerReady;
+    public void ListenerReady()
+    {
+        OnListenerReady?.Invoke();
+    }
 }
diff --git a/src/libp2p/Libp2p.Core/PeerFactory.cs b/src/libp2p/Libp2p.Core/PeerFactory.cs
@@ -37,7 +37,7 @@ public void Setup(IProtocol protocol, IChannelFactory upChannelFactory)
         _upChannelFactory = upChannelFactory;
     }
 
-    private Task<IListener> ListenAsync(LocalPeer peer, Multiaddr addr, CancellationToken token)
+    private async Task<IListener> ListenAsync(LocalPeer peer, Multiaddr addr, CancellationToken token)
     {
         peer.Address = addr;
         if (!peer.Address.Has(Enums.Multiaddr.P2p))
@@ -51,16 +51,28 @@ private Task<IListener> ListenAsync(LocalPeer peer, Multiaddr addr, Cancellation
             token.Register(() => chan.CloseAsync());
         }
 
-        PeerContext peerCtx = new()
+        TaskCompletionSource ts = new();
+
+
+        PeerContext peerContext = new()
         {
             Id = $"ctx-{++CtxId}",
             LocalPeer = peer,
         };
-        RemotePeer remotePeer = new(this, peer, peerCtx);
-        peerCtx.RemotePeer = remotePeer;
+
+        peerContext.OnListenerReady += OnListenerReady;
+
+        void OnListenerReady()
+        {
+            ts.SetResult();
+            peerContext.OnListenerReady -= OnListenerReady;
+        }
+
+        RemotePeer remotePeer = new(this, peer, peerContext);
+        peerContext.RemotePeer = remotePeer;
 
         PeerListener result = new(chan, peer);
-        peerCtx.OnRemotePeerConnection += remotePeer =>
+        peerContext.OnRemotePeerConnection += remotePeer =>
         {
             if (((RemotePeer)remotePeer).LocalPeer != peer)
             {
@@ -70,9 +82,10 @@ private Task<IListener> ListenAsync(LocalPeer peer, Multiaddr addr, Cancellation
             ConnectedTo(remotePeer, false)
                 .ContinueWith(t => { result.RaiseOnConnection(remotePeer); }, token);
         };
-        _ = _protocol.ListenAsync(chan, _upChannelFactory, peerCtx);
+        _ = _protocol.ListenAsync(chan, _upChannelFactory, peerContext);
 
-        return Task.FromResult((IListener)result);
+        await ts.Task;
+        return result;
     }
 
     protected virtual Task ConnectedTo(IRemotePeer peer, bool isDialer)

diff --git a/src/libp2p/Libp2p.Protocols.IpTcp/IpTcpProtocol.cs b/src/libp2p/Libp2p.Protocols.IpTcp/IpTcpProtocol.cs
@@ -34,6 +34,9 @@ public async Task ListenAsync(IChannel channel, IChannelFactory? channelFactory,
         srv.Bind(new IPEndPoint(ipAddress, tcpPort));
         srv.Listen(tcpPort);
 
+        _logger?.LogDebug("Ready to handle connections");
+        context.ListenerReady();
+
         IPEndPoint localIpEndpoint = (IPEndPoint)srv.LocalEndPoint!;
         channel.OnClose(() =>
         {

diff --git a/src/libp2p/Libp2p.Protocols.Quic/QuicProtocol.cs b/src/libp2p/Libp2p.Protocols.Quic/QuicProtocol.cs
@@ -88,6 +88,9 @@ public async Task ListenAsync(IChannel channel, IChannelFactory? channelFactory,
             await listener.DisposeAsync();
         });
 
+        _logger?.LogDebug("Ready to handle connections");
+        context.ListenerReady();
+
         while (!channel.IsClosed)
         {
             QuicConnection connection = await listener.AcceptConnectionAsync(channel.Token);
@@ -131,6 +134,7 @@ public async Task DialAsync(IChannel channel, IChannelFactory? channelFactory, I
             MaxInboundBidirectionalStreams = 100,
             ClientAuthenticationOptions = new SslClientAuthenticationOptions
             {
+                TargetHost = null,
                 ApplicationProtocols = protocols,
                 RemoteCertificateValidationCallback = (_, c, _, _) => VerifyRemoteCertificate(context.RemotePeer, c),
                 ClientCertificates = new X509CertificateCollection { CertificateHelper.CertificateFromIdentity(_sessionKey, context.LocalPeer.Identity) },
@@ -139,7 +143,7 @@ public async Task DialAsync(IChannel channel, IChannelFactory? channelFactory, I
         };
 
         QuicConnection connection = await QuicConnection.ConnectAsync(clientConnectionOptions);
-
+       
         channel.OnClose(async () =>
         {
             await connection.CloseAsync(0);