Rename Traking proprties

simhaonline · Dec 10, 2021 · fcf76d2 · fcf76d2
1 parent 418ab20
commit fcf76d2
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/VpnHood.Server.Access/TrackingOptions.cs b/VpnHood.Server.Access/TrackingOptions.cs
@@ -4,9 +4,9 @@ namespace VpnHood.Server
 {
     public class TrackingOptions
     {
-        public bool LocalPort { get; set; }
-        public bool ClientIp { get; set; }
+        public bool LogLocalPort { get; set; }
+        public bool LogClientIp { get; set; }
 
-        public bool IsEnabled() => ClientIp || LocalPort;
+        public bool IsEnabled() => LogClientIp || LogLocalPort;
     }
 }
diff --git a/VpnHood.Server/Session.cs b/VpnHood.Server/Session.cs
@@ -186,7 +186,7 @@ protected override UdpClient CreateUdpClient(AddressFamily addressFamily)
                 var udpClient = _session._socketFactory.CreateUdpClient(addressFamily);
 
                 //tracking
-                if (_trackingOptions.LocalPort)
+                if (_trackingOptions.LogLocalPort)
                 {
                     var log = $"Udp | SessionId: {_session.SessionId}, Port: {((IPEndPoint)udpClient.Client.LocalEndPoint).Port}";
                     VhLogger.Instance.LogInformation(GeneralEventId.Track, log);

diff --git a/VpnHood.Server/TcpHost.cs b/VpnHood.Server/TcpHost.cs
@@ -234,7 +234,7 @@ private async Task ProcessHello(TcpClientStream tcpClientStream, CancellationTok
             //tracking
             if (_sessionManager.TrackingOptions.IsEnabled())
             {
-                var clientIp = _sessionManager.TrackingOptions.ClientIp ? clientEndPoint.Address.ToString() : "*"; 
+                var clientIp = _sessionManager.TrackingOptions.LogClientIp ? clientEndPoint.Address.ToString() : "*"; 
                 var log = $"New Session | SessionId: {session.SessionId}, TokenId: {request.TokenId}, ClientIp: {clientIp}";
                 VhLogger.Instance.LogInformation(GeneralEventId.Track, log);
             }
@@ -342,7 +342,7 @@ private async Task ProcessTcpProxyChannel(TcpClientStream tcpClientStream, Cance
                 Util.TcpClient_SetKeepAlive(tcpClient2, true);
 
                 //tracking
-                if (_sessionManager.TrackingOptions.LocalPort)
+                if (_sessionManager.TrackingOptions.LogLocalPort)
                 {
                     var log = $"Tcp | SessionId: {session.SessionId}, Port: {((IPEndPoint)tcpClient2.Client.LocalEndPoint).Port}";
                     VhLogger.Instance.LogInformation(GeneralEventId.Track, log);

diff --git a/VpnHood.ZTest/Tests/ServerTest.cs b/VpnHood.ZTest/Tests/ServerTest.cs
@@ -26,6 +26,8 @@ public async Task Reconfigure()
             var fileAccessServerOptions = new FileAccessServerOptions { TcpEndPoints = new[] { serverEndPoint } };
             using var fileAccessServer = TestHelper.CreateFileAccessServer(fileAccessServerOptions);
             fileAccessServer.ServerConfig.UpdateStatusInterval = 1;
+            fileAccessServer.ServerConfig.TrackingOptions.LogClientIp = true;
+            fileAccessServer.ServerConfig.TrackingOptions.LogLocalPort = true;
             using var testAccessServer = new TestAccessServer(fileAccessServer);
 
             var dateTime = DateTime.Now;
@@ -37,6 +39,8 @@ public async Task Reconfigure()
             await Task.Delay(2500);
             Assert.IsNull(testAccessServer.ConfigCode);
             Assert.IsTrue(testAccessServer.LastConfigureTime > dateTime);
+            Assert.IsTrue(server.SessionManager.TrackingOptions.LogClientIp);
+            Assert.IsTrue(server.SessionManager.TrackingOptions.LogLocalPort);
         }
 
         [TestMethod]