Merge branch 'development'

vpnhood · Oct 22, 2021 · a7d6700 · a7d6700
2 parents baff0b1 + 93b6894
commit a7d6700
Show file tree

Hide file tree

Showing 84 changed files with 4,475 additions and 3,515 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,21 @@
-# v2.1.276
+# v2.2.283
+### Client
+* Feature: Allow to have multi-endpoints in AccessToken
+* Feature: Create IPv6 tunnel when a client has access to a server by IPv6
+* Feature: Add "Exclude Local Network" to UI settings
+* Fix: UDP Channel
+
+### Server
+* Feature: Dynamic configuration from AccessServer
+* Feature: Multi listeners for different EndPoints
+* Fix: Few bug in disposing
+* Fix: linux: systemctl restart VpnHoodServer 
+
+# v2.1.276
+* Feature: IPv6 Support
+* Fix: Some packet loss in ping 
+
+# v2.1.276
 * Feature: IPv6 Support
 * Fix: Some packet loss in ping 
 
@@ -282,3 +299,4 @@
 
 
 
+
diff --git a/Pub/Version.json b/Pub/Version.json
diff --git a/Samples/VpnHood.Samples.SimpleClient.Droid/MainActivity.cs b/Samples/VpnHood.Samples.SimpleClient.Droid/MainActivity.cs
@@ -68,8 +68,7 @@ private async Task ConnectTask()
                 // Connect
                 // accessKey must obtain from the server
                 var clientId = Guid.Parse("7BD6C156-EEA3-43D5-90AF-B118FE47ED0B");
-                var accessKey =
-                    "vh://eyJuYW1lIjoiVnBuSG9vZCBQdWJsaWMgU2VydmVycyIsInYiOjEsInNpZCI6MTAwMSwidGlkIjoiNWFhY2VjNTUtNWNhYy00NTdhLWFjYWQtMzk3Njk2OTIzNmY4Iiwic2VjIjoiNXcraUhNZXcwQTAzZ3c0blNnRFAwZz09IiwiaXN2IjpmYWxzZSwiaG5hbWUiOiJtby5naXdvd3l2eS5uZXQiLCJocG9ydCI6NDQzLCJoZXAiOiI1MS44MS4yMTAuMTY0OjQ0MyIsImNoIjoiM2dYT0hlNWVjdWlDOXErc2JPN2hsTG9rUWJBPSIsInBiIjp0cnVlLCJ1cmwiOiJodHRwczovL3d3dy5kcm9wYm94LmNvbS9zLzExN2x6bHg2Z2N2YzNyZj9kbD0xIn0=";
+                var accessKey = "vh://eyJuYW1lIjoiVnBuSG9vZCBQdWJsaWMgU2VydmVycyIsInYiOjEsInNpZCI6MTAwMSwidGlkIjoiNWFhY2VjNTUtNWNhYy00NTdhLWFjYWQtMzk3Njk2OTIzNmY4Iiwic2VjIjoiNXcraUhNZXcwQTAzZ3c0blNnRFAwZz09IiwiaXN2IjpmYWxzZSwiaG5hbWUiOiJtby5naXdvd3l2eS5uZXQiLCJocG9ydCI6NDQzLCJjaCI6IjNnWE9IZTVlY3VpQzlxK3NiTzdobExva1FiQT0iLCJwYiI6dHJ1ZSwidXJsIjoiaHR0cHM6Ly93d3cuZHJvcGJveC5jb20vcy82YWlrdHFmM2xhZW9vaGY/ZGw9MSIsImVwIjpbIjUxLjgxLjIxMC4xNjQ6NDQzIl19";
                 var token = Token.FromAccessKey(accessKey);
                 var packetCapture = await Device.CreatePacketCapture();
 

diff --git a/Samples/VpnHood.Samples.SimpleClient.Droid/VpnHood.Samples.SimpleClient.Droid.csproj b/Samples/VpnHood.Samples.SimpleClient.Droid/VpnHood.Samples.SimpleClient.Droid.csproj
@@ -108,10 +108,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="VpnHood.Client">
-      <Version>2.1.276</Version>
+      <Version>2.2.283</Version>
     </PackageReference>
     <PackageReference Include="VpnHood.Client.Device.Android">
-      <Version>2.1.276</Version>
+      <Version>2.2.283</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.Essentials" Version="1.7.0" />
   </ItemGroup>

diff --git a/Samples/VpnHood.Samples.SimpleClient.Win/Program.cs b/Samples/VpnHood.Samples.SimpleClient.Win/Program.cs
@@ -3,8 +3,8 @@
 using VpnHood.Client;
 using VpnHood.Client.Device.WinDivert;
 using VpnHood.Common;
-// ReSharper disable StringLiteralTypo
 
+// ReSharper disable StringLiteralTypo
 namespace VpnHood.Samples.SimpleClient.Win
 {
     internal class Program
@@ -13,20 +13,20 @@ private static void Main()
         {
             Console.WriteLine("Hello VpnClient!");
 
-            // clientId should be generated for each client
+            // a clientId should be generated for each client
+            var clientId = Guid.Parse("7BD6C156-EEA3-43D5-90AF-B118FE47ED0A");
 
             // accessKey must obtain from the server
-            var clientId = Guid.Parse("7BD6C156-EEA3-43D5-90AF-B118FE47ED0A");
-            var accessKey =
-                "vh://eyJuYW1lIjoiVnBuSG9vZCBQdWJsaWMgU2VydmVycyIsInYiOjEsInNpZCI6MTAwMSwidGlkIjoiNWFhY2VjNTUtNWNhYy00NTdhLWFjYWQtMzk3Njk2OTIzNmY4Iiwic2VjIjoiNXcraUhNZXcwQTAzZ3c0blNnRFAwZz09IiwiaXN2IjpmYWxzZSwiaG5hbWUiOiJtby5naXdvd3l2eS5uZXQiLCJocG9ydCI6NDQzLCJoZXAiOiI1MS44MS4yMTAuMTY0OjQ0MyIsImNoIjoiM2dYT0hlNWVjdWlDOXErc2JPN2hsTG9rUWJBPSIsInBiIjp0cnVlLCJ1cmwiOiJodHRwczovL3d3dy5kcm9wYm94LmNvbS9zLzExN2x6bHg2Z2N2YzNyZj9kbD0xIn0=";
+            var accessKey = "vh://eyJuYW1lIjoiVnBuSG9vZCBQdWJsaWMgU2VydmVycyIsInYiOjEsInNpZCI6MTAwMSwidGlkIjoiNWFhY2VjNTUtNWNhYy00NTdhLWFjYWQtMzk3Njk2OTIzNmY4Iiwic2VjIjoiNXcraUhNZXcwQTAzZ3c0blNnRFAwZz09IiwiaXN2IjpmYWxzZSwiaG5hbWUiOiJtby5naXdvd3l2eS5uZXQiLCJocG9ydCI6NDQzLCJjaCI6IjNnWE9IZTVlY3VpQzlxK3NiTzdobExva1FiQT0iLCJwYiI6dHJ1ZSwidXJsIjoiaHR0cHM6Ly93d3cuZHJvcGJveC5jb20vcy82YWlrdHFmM2xhZW9vaGY/ZGw9MSIsImVwIjpbIjUxLjgxLjIxMC4xNjQ6NDQzIl19";
             var token = Token.FromAccessKey(accessKey);
 
             var packetCapture = new WinDivertPacketCapture();
             var vpnHoodClient = new VpnHoodClient(packetCapture, clientId, token, new ClientOptions());
 
+            // connect to VpnHood server
             vpnHoodClient.Connect().Wait();
-            Console.WriteLine(
-                "VpnHood Client Is Running! Open your browser and browse the Internet! Press Ctrl+C to stop.");
+
+            Console.WriteLine("VpnHood Client Is Running! Open your browser and browse the Internet! Press Ctrl+C to stop.");
             while (vpnHoodClient.State != ClientState.Disposed)
                 Thread.Sleep(1000);
         }

diff --git a/Samples/VpnHood.Samples.SimpleClient.Win/VpnHood.Samples.SimpleClient.Win.csproj b/Samples/VpnHood.Samples.SimpleClient.Win/VpnHood.Samples.SimpleClient.Win.csproj
@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="VpnHood.Client" Version="2.1.276" />
-    <PackageReference Include="VpnHood.Client.Device.WinDivert" Version="2.1.276" />
+    <PackageReference Include="VpnHood.Client" Version="2.2.283" />
+    <PackageReference Include="VpnHood.Client.Device.WinDivert" Version="2.2.283" />
   </ItemGroup>
 
 </Project>
diff --git a/VpnHood.App.Launcher/Updater.cs b/VpnHood.App.Launcher/Updater.cs
@@ -274,8 +274,7 @@ private void ExitAndLaunchUpdater()
                 var tempLauncherFilePath = Path.Combine(tempLaunchFolder, "run.dll");
                 _logger.LogInformation($"Preparing updater. {tempLaunchFolder}");
                 if (Directory.Exists(tempLaunchFolder)) Directory.Delete(tempLaunchFolder, true);
-                var updaterAssemblyLocation = Path.GetDirectoryName(typeof(Updater).Assembly.Location) ??
-                                             throw new Exception("Could not find update assembly location!");
+                var updaterAssemblyLocation = Path.GetDirectoryName(typeof(Updater).Assembly.Location) ?? throw new Exception("Could not find update assembly location!");
                 DirectoryCopy(updaterAssemblyLocation, tempLaunchFolder, true);
 
                 // dotnet tempdir/launcher.dll update package.zip appFolder orgArguments
@@ -346,7 +345,7 @@ private int Launch()
             }
             catch (OperationCanceledException)
             {
-                _logger.LogWarning("launcher is killing server!");
+                _logger.LogWarning("launcher is killing the process!");
                 process.Kill(true);
 
                 // must return zero otherwise let linux service will kill the updater

diff --git a/VpnHood.App.Launcher/VpnHood.App.Launcher.csproj b/VpnHood.App.Launcher/VpnHood.App.Launcher.csproj
@@ -14,9 +14,9 @@
     <PackageIcon>VpnHood.png</PackageIcon>
     <Product>VpnHood.App.Launcher</Product>
     <ApplicationIcon>Resources\VpnHood.ico</ApplicationIcon>
-    <Version>2.1.276</Version>
-    <AssemblyVersion>2.1.276</AssemblyVersion>
-    <FileVersion>2.1.276</FileVersion>
+    <Version>2.2.283</Version>
+    <AssemblyVersion>2.2.283</AssemblyVersion>
+    <FileVersion>2.2.283</FileVersion>
     <LangVersion>9.0</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/VpnHood.Client.App.Android/Assets/SPA.zip b/VpnHood.Client.App.Android/Assets/SPA.zip
diff --git a/VpnHood.Client.App.Android/Properties/AndroidManifest.xml b/VpnHood.Client.App.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="276" package="com.vpnhood.client.android" android:installLocation="auto" android:versionName="2.1.276">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="283" package="com.vpnhood.client.android" android:installLocation="auto" android:versionName="2.2.283">
   <uses-sdk android:minSdkVersion="22" android:targetSdkVersion="30" />
   <uses-permission android:name="android.permission.INTERNET" />
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />