Readded RM nuget.

NTDLS · Jun 8, 2024 · 16ea21b · 16ea21b
1 parent 992f9a6
commit 16ea21b
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/NetTunnel.Service/FramePayloads/EncryptionProvider.cs b/NetTunnel.Service/FramePayloads/EncryptionProvider.cs
@@ -16,7 +16,7 @@ public byte[] Decrypt(byte[] encryptedPayload)
         {
             lock (_streamCryptography)
             {
-                Console.WriteLine($"Decrypt {encryptedPayload.Length:n0} bytes.");
+                //Console.WriteLine($"Decrypt {encryptedPayload.Length:n0} bytes.");
                 _streamCryptography.Cipher(ref encryptedPayload);
                 _streamCryptography.ResetStream();
             }
@@ -27,7 +27,7 @@ public byte[] Encrypt(byte[] payload)
         {
             lock (_streamCryptography)
             {
-                Console.WriteLine($"Encrypt {payload.Length:n0} bytes.");
+                //Console.WriteLine($"Encrypt {payload.Length:n0} bytes.");
                 _streamCryptography.Cipher(ref payload);
                 _streamCryptography.ResetStream();
             }

diff --git a/NetTunnel.Service/NetTunnel.Service.csproj b/NetTunnel.Service/NetTunnel.Service.csproj
@@ -22,14 +22,14 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.6" />
     <PackageReference Include="NTDLS.NASCCL" Version="1.1.1" />
+    <PackageReference Include="NTDLS.ReliableMessaging" Version="1.7.6" />
     <PackageReference Include="NTDLS.SecureKeyExchange" Version="2.2.1" />
     <PackageReference Include="NTDLS.Semaphore" Version="3.3.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
     <PackageReference Include="Topshelf" Version="4.3.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\NTDLS.ReliableMessaging\NTDLS.ReliableMessaging\NTDLS.ReliableMessaging.csproj" />
     <ProjectReference Include="..\NetTunnel.ClientAPI\NetTunnel.ClientAPI.csproj" />
     <ProjectReference Include="..\NetTunnel.Library\NetTunnel.Library.csproj" />
   </ItemGroup>

diff --git a/NetTunnel.Service/TunnelEngine/Endpoints/EndpointInbound.cs b/NetTunnel.Service/TunnelEngine/Endpoints/EndpointInbound.cs
@@ -13,18 +13,21 @@ internal class EndpointInbound : BaseEndpoint, IEndpoint
     {
         private Thread? _inboundConnectionThread;
 
-        private readonly TcpListener _listener;
+        private TcpListener? _listener;
+        private readonly NtEndpointInboundConfiguration _configuration;
 
         public EndpointInbound(TunnelEngineCore core, ITunnel tunnel, NtEndpointInboundConfiguration configuration)
             : base(core, tunnel, configuration.EndpointId, configuration.Name, configuration.TransmissionPort)
         {
-            _listener = new TcpListener(IPAddress.Any, configuration.TransmissionPort);
+            _configuration = configuration;
         }
 
         public override void Start()
         {
             base.Start();
 
+            _listener = new TcpListener(IPAddress.Any, _configuration.TransmissionPort);
+
             _tunnel.Core.Logging.Write(Constants.NtLogSeverity.Verbose, $"Starting inbound endpoint '{Name}' on port {TransmissionPort}.");
 
             _inboundConnectionThread = new Thread(InboundConnectionThreadProc);
@@ -35,7 +38,11 @@ public override void Stop()
         {
             base.Stop();
 
-            Utility.TryAndIgnore(_listener.Stop);
+            if (_listener != null)
+            {
+                Utility.TryAndIgnore(_listener.Stop);
+                Utility.TryAndIgnore(_listener.Dispose);
+            }
 
             _tunnel.Core.Logging.Write(Constants.NtLogSeverity.Verbose, $"Stopping inbound endpoint '{Name}' on port {TransmissionPort}.");
 
@@ -57,7 +64,7 @@ void InboundConnectionThreadProc()
 
             try
             {
-                _listener.Start();
+                _listener.EnsureNotNull().Start();
 
                 _core.Logging.Write(Constants.NtLogSeverity.Verbose, $"Listening inbound endpoint '{Name}' on port {TransmissionPort}");
 
@@ -87,7 +94,10 @@ void InboundConnectionThreadProc()
             }
             finally
             {
-                Utility.TryAndIgnore(_listener.Stop);
+                if (_listener != null)
+                {
+                    Utility.TryAndIgnore(_listener.Stop);
+                }
             }
         }
     }

diff --git a/NetTunnel.Service/TunnelEngine/Managers/TunnelInboundManager.cs b/NetTunnel.Service/TunnelEngine/Managers/TunnelInboundManager.cs
@@ -93,8 +93,6 @@ public void DeleteEndpoint(Guid tunnelId, Guid endpointId)
                 endpoint.Stop();
 
                 tunnel.DeleteEndpoint(endpointId);
-
-                endpoint.Start();
             });
         }
 

diff --git a/NetTunnel.sln b/NetTunnel.sln
@@ -16,8 +16,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		@Installers\Installer.Iss = @Installers\Installer.Iss
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NTDLS.ReliableMessaging", "..\NTDLS.ReliableMessaging\NTDLS.ReliableMessaging\NTDLS.ReliableMessaging.csproj", "{04467632-7717-4A9E-A1E9-628957D16CA0}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -40,10 +38,6 @@ Global
 		{1D602D6B-348B-41FE-ABC8-9A98FD6CD247}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1D602D6B-348B-41FE-ABC8-9A98FD6CD247}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1D602D6B-348B-41FE-ABC8-9A98FD6CD247}.Release|Any CPU.Build.0 = Release|Any CPU
-		{04467632-7717-4A9E-A1E9-628957D16CA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{04467632-7717-4A9E-A1E9-628957D16CA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{04467632-7717-4A9E-A1E9-628957D16CA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{04467632-7717-4A9E-A1E9-628957D16CA0}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE