Set default tunnel MaxDatagramChannels

sitsaz · Dec 20, 2021 · c5c8490 · c5c8490
1 parent 0337e12
commit c5c8490
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/VpnHood.Server.Access/SessionOptions.cs b/VpnHood.Server.Access/SessionOptions.cs
@@ -18,7 +18,7 @@ public class SessionOptions
         [JsonConverter(typeof(TimeSpanConverter))]
         public TimeSpan IcmpTimeout { get; set; } = TimeSpan.FromSeconds(30);
         public long SyncCacheSize { get; set; } = 100 * 1000000; // 100 MB
-        public int MaxDatagramChannelCount { get; set; } = 8;
+        public int MaxDatagramChannelCount { get; set; }
         public int MaxUdpPortCount { get; set; }
         public int TcpBufferSize { get; set; }
     }

diff --git a/VpnHood.Server/Session.cs b/VpnHood.Server/Session.cs
@@ -41,11 +41,11 @@ internal Session(IAccessServer accessServer, SessionResponse sessionResponse, So
             SessionResponse = new ResponseBase(sessionResponse);
             SessionId = sessionResponse.SessionId;
             SessionKey = sessionResponse.SessionKey ?? throw new InvalidOperationException($"{nameof(sessionResponse)} does not have {nameof(sessionResponse.SessionKey)}!");
-            Tunnel = new Tunnel(new TunnelOptions
-            {
-                MaxDatagramChannelCount = options.MaxDatagramChannelCount,
-                TcpTimeout = options.TcpTimeout
-            });
+
+            var tunnelOptions = new TunnelOptions();
+            if (options.MaxDatagramChannelCount > 0) tunnelOptions.MaxDatagramChannelCount = options.MaxDatagramChannelCount;
+            if (options.TcpTimeout != TimeSpan.Zero) tunnelOptions.TcpTimeout = options.TcpTimeout;
+            Tunnel = new Tunnel(tunnelOptions);
             Tunnel.OnPacketReceived += Tunnel_OnPacketReceived;
             Tunnel.OnTrafficChanged += Tunnel_OnTrafficChanged;
 

diff --git a/VpnHood.Server/VpnHoodServer.cs b/VpnHood.Server/VpnHoodServer.cs
@@ -239,6 +239,10 @@ private async Task SendStatusToAccessServer()
                 VhLogger.Instance.LogError(ex, "Could not send server status!");
             }
 
+            //todo: debug
+            GC.Collect();
+            GC.WaitForPendingFinalizers();
+
             // reconfigure
             if (configurationCode != null)
             {

diff --git a/VpnHood.Tunneling/TunnelOptions.cs b/VpnHood.Tunneling/TunnelOptions.cs
@@ -5,6 +5,6 @@ namespace VpnHood.Tunneling
     public class TunnelOptions
     {
         public TimeSpan TcpTimeout { get; set; }
-        public int MaxDatagramChannelCount { get; set; } = 1;
+        public int MaxDatagramChannelCount { get; set; } = 8;
     }
 }
diff --git a/VpnHood.ZTest/Tests/TunnelTest.cs b/VpnHood.ZTest/Tests/TunnelTest.cs
@@ -161,7 +161,7 @@ public void UdpChannel_via_Tunnel()
             };
 
             // send packet to server through tunnel
-            clientTunnel.SendPacket(packets.ToArray());
+            clientTunnel.SendPacket(packets.ToArray()).Wait();
             waitHandle.WaitOne(5000);
             Assert.AreEqual(packets.Count, serverReceivedPackets.Length);
             Assert.AreEqual(packets.Count, clientReceivedPackets.Length);