Chage ConfigureCommand to ConfigCode

simhaonline · Nov 21, 2021 · 21e0894 · 21e0894
1 parent a4c4499
commit 21e0894
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 12 deletions.
diff --git a/VpnHood.Server.Access/ServerCommand.cs b/VpnHood.Server.Access/ServerCommand.cs
@@ -1,7 +1,9 @@
-namespace VpnHood.Server
+using System;
+
+namespace VpnHood.Server
 {
     public class ServerCommand
     {
-        public bool Reconfigure { get; set; }
+        public Guid? ConfigCode { get; set; }
     }
 }
diff --git a/VpnHood.Server.Access/ServerInfo.cs b/VpnHood.Server.Access/ServerInfo.cs
@@ -37,5 +37,6 @@ public ServerInfo(Version version,
         public string? OsInfo { get; set; }
         public long TotalMemory { get; set; }
         public string? MachineName { get; set; }
+        public Guid? ConfigCode { get; set; }
     }
 }
diff --git a/VpnHood.Server/VpnHoodServer.cs b/VpnHood.Server/VpnHoodServer.cs
@@ -118,7 +118,7 @@ public async Task Start()
             await Configure();
         }
 
-        private async Task Configure()
+        private async Task Configure(Guid? configurationCode = null)
         {
             if (_tcpHost.IsDisposed)
                 throw new ObjectDisposedException($"Could not configure after disposing {nameof(TcpHost)}!");
@@ -138,6 +138,7 @@ private async Task Configure()
                     MachineName = Environment.MachineName,
                     OsInfo = SystemInfoProvider.GetOperatingSystemInfo(),
                     TotalMemory = SystemInfoProvider.GetSystemInfo().TotalMemory,
+                    ConfigCode = configurationCode
                 };
 
                 // get configuration from access server
@@ -224,22 +225,22 @@ public ServerStatus Status
 
         private async Task SendStatusToAccessServer()
         {
-            bool reconfigure = false;
+            Guid? configurationCode = null;
             try
             {
                 var res = await AccessServer.Server_UpdateStatus(Status);
-                reconfigure = res.Reconfigure;
+                configurationCode = res.ConfigCode;
             }
             catch (Exception ex)
             {
                 VhLogger.Instance.LogError(ex, "Could not send server status!");
             }
 
             // reconfigure
-            if (reconfigure)
+            if (configurationCode!=null)
             {
                 VhLogger.Instance.LogInformation("Reconfiguration is requiested.");
-                _ = Configure();
+                _ = Configure(configurationCode);
             }
         }
     }

diff --git a/VpnHood.ZTest/TestAccessServer.cs b/VpnHood.ZTest/TestAccessServer.cs
@@ -27,19 +27,20 @@ public TestAccessServer(IAccessServer baseAccessServer)
 
         public bool IsMaintenanceMode => _restAccessServer.IsMaintenanceMode;
 
-        public bool Reconfigure { get; set; }
+        public Guid? ConfigCode { get; set; }
 
         public async Task<ServerCommand> Server_UpdateStatus(ServerStatus serverStatus)
         {
             var ret = await  _restAccessServer.Server_UpdateStatus(serverStatus);
-            ret.Reconfigure = Reconfigure;
-            Reconfigure = false;
+            ret.ConfigCode = ConfigCode;
             return ret;
         }
 
         public Task<ServerConfig> Server_Configure(ServerInfo serverInfo)
         {
             LastConfigureTime = DateTime.Now;
+            if (ConfigCode == serverInfo.ConfigCode)
+                ConfigCode = null;
             return _restAccessServer.Server_Configure(serverInfo);
         }
 

diff --git a/VpnHood.ZTest/Tests/ServerTest.cs b/VpnHood.ZTest/Tests/ServerTest.cs
@@ -24,9 +24,9 @@ public async Task Reconfigure()
             Assert.IsTrue(testAccessServer.LastConfigureTime > dateTime);
 
             dateTime = DateTime.Now;
-            testAccessServer.Reconfigure = true;
+            testAccessServer.ConfigCode = Guid.NewGuid();
             await Task.Delay(2000);
-            Assert.IsFalse(testAccessServer.Reconfigure);
+            Assert.IsNull(testAccessServer.ConfigCode);
             Assert.IsTrue(testAccessServer.LastConfigureTime > dateTime);
         }
     }