Merge branch 'development'

vpnhood · May 17, 2023 · 81458dd · 81458dd
2 parents d0340e7 + 8759a9e
commit 81458dd
Show file tree

Hide file tree

Showing 60 changed files with 895 additions and 3,703 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v2.9.369
+### Client & Server
+* Feature: Use shared UDP port 
+* Feature: Improve protocol anonymity and anti-fingerprinting for UDP 
+* Update: Improve security, performance, and battery usage
+* Update: Remove excessive error logs on disconnecting
+
 # v2.8.361
 ### Server
 * Feature: Enable hot reconfig for VpnHood Server TCP listener to avoid unnecessary restarts on unchanged endpoints

diff --git a/Pub/Version.json b/Pub/Version.json
@@ -1,6 +1,6 @@
 {
-  "Version": "2.8.361",
-  "BumpTime": "2023-03-17T20:04:49.4236941Z",
+  "Version": "2.9.369",
+  "BumpTime": "2023-05-17T06:12:44.3095258Z",
   "Prerelease": false,
   "DeprecatedVersion": "2.0.0"
 }
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="360" package="com.vpnhood.client.android" android:installLocation="auto" android:versionName="2.8.360">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="369" package="com.vpnhood.client.android" android:installLocation="auto" android:versionName="2.9.369">
   <uses-sdk android:minSdkVersion="22" android:targetSdkVersion="33" />
   <uses-feature android:name="android.software.leanback" android:required="false" />
   <uses-feature android:name="android.hardware.touchscreen" android:required="false" />

diff --git a/VpnHood.Client.App.UI/VpnHood.Client.App.UI.csproj b/VpnHood.Client.App.UI/VpnHood.Client.App.UI.csproj
@@ -12,8 +12,8 @@
     <PackageIcon>VpnHood.png</PackageIcon>
     <Description>Tiny internal webserver to server your single-page application (SPA). You need this only if you want to create a UI for your VpnHood client by single-page application (SPA).</Description>
     <PackageId>VpnHood.Client.App.UI</PackageId>
-    <Version>2.8.361</Version>
-    <AssemblyVersion>2.8.361</AssemblyVersion>
+    <Version>2.9.369</Version>
+    <AssemblyVersion>2.9.369</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

diff --git a/VpnHood.Client.App.Win/VpnHood.Client.App.Win.csproj b/VpnHood.Client.App.Win/VpnHood.Client.App.Win.csproj
@@ -19,8 +19,8 @@
     <PackageIcon>VpnHood.png</PackageIcon>
     <PackageId>VpnHood.Client.App.Win</PackageId>
     <StartupObject></StartupObject>
-    <Version>2.8.361</Version>
-    <AssemblyVersion>2.8.361</AssemblyVersion>
+    <Version>2.9.369</Version>
+    <AssemblyVersion>2.9.369</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>11</LangVersion>
@@ -67,7 +67,7 @@
 
   <ItemGroup>
     <PackageReference Include=" " Version="1.0.664.37" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1587.40" />
+    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1722.45" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/VpnHood.Client.App/VpnHood.Client.App.csproj b/VpnHood.Client.App/VpnHood.Client.App.csproj
@@ -11,8 +11,8 @@
     <RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
     <Description>Readymade Vpn App skeleton for VpnHood clients. You just need to create a UI on it.</Description>
     <PackageId>VpnHood.Client.App</PackageId>
-    <Version>2.8.361</Version>
-    <AssemblyVersion>2.8.361</AssemblyVersion>
+    <Version>2.9.369</Version>
+    <AssemblyVersion>2.9.369</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

diff --git a/VpnHood.Client.Device.WinDivert/VpnHood.Client.Device.WinDivert.csproj b/VpnHood.Client.Device.WinDivert/VpnHood.Client.Device.WinDivert.csproj
@@ -9,10 +9,10 @@
     <RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
     <PackageIcon>VpnHood.png</PackageIcon>
     <Description>VpnHood client device provider for Windows using WinDivert.</Description>
-    <Version>2.8.361</Version>
+    <Version>2.9.369</Version>
     <PackageId>VpnHood.Client.Device.WinDivert</PackageId>
     <Version>1.1.226</Version>
-    <AssemblyVersion>2.8.361</AssemblyVersion>
+    <AssemblyVersion>2.9.369</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

diff --git a/VpnHood.Client.Device/VpnHood.Client.Device.csproj b/VpnHood.Client.Device/VpnHood.Client.Device.csproj
@@ -14,8 +14,8 @@
     <RepositoryType></RepositoryType>
     <PackageId>VpnHood.Client.Device</PackageId>
     <RootNamespace>VpnHood.Client.Device</RootNamespace>
-    <Version>2.8.361</Version>
-    <AssemblyVersion>2.8.361</AssemblyVersion>
+    <Version>2.9.369</Version>
+    <AssemblyVersion>2.9.369</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>

diff --git a/VpnHood.Client/ClientUdpChannelTransmitter.cs b/VpnHood.Client/ClientUdpChannelTransmitter.cs
@@ -0,0 +1,22 @@
+using System.Net;
+using System.Net.Sockets;
+using VpnHood.Tunneling;
+
+namespace VpnHood.Client;
+
+public class ClientUdpChannelTransmitter : UdpChannelTransmitter
+{
+    private readonly UdpChannel2 _udpChannel;
+
+    public ClientUdpChannelTransmitter(UdpChannel2 udpChannel, UdpClient udpClient, IPEndPoint serverEndPoint, byte[] serverKey) 
+        : base(udpClient, serverKey)
+    {
+        _udpChannel = udpChannel;
+        udpChannel.SetRemote(this, serverEndPoint);
+    }
+
+    protected override void OnReceiveData(ulong sessionId, IPEndPoint remoteEndPoint, long channelCryptorPosition, byte[] buffer, int bufferIndex)
+    {
+        _udpChannel.OnReceiveData(channelCryptorPosition, buffer, bufferIndex);
+    }
+}
diff --git a/VpnHood.Client/TcpProxyHost.cs b/VpnHood.Client/TcpProxyHost.cs
@@ -246,7 +246,7 @@ await Client.AddPassthruTcpStream(
                 Client.SessionId,
                 Client.SessionKey,
                 new IPEndPoint(natItem.DestinationAddress, natItem.DestinationPort),
-                VhUtil.GenerateSessionKey(),
+                VhUtil.GenerateKey(),
                 natItem.DestinationPort == 443 ? TunnelUtil.TlsHandshakeLength : -1);
 
             tcpProxyClientStream = await Client.GetTlsConnectionToServer(GeneralEventId.TcpProxyChannel, cancellationToken);

diff --git a/VpnHood.Client/VpnHood.Client.csproj b/VpnHood.Client/VpnHood.Client.csproj
@@ -13,8 +13,8 @@
     <Copyright>2022 VpnHood</Copyright>
     <PackageId>VpnHood.Client</PackageId>
     <PackageTags>VPN VpnClient Proxy</PackageTags>
-    <Version>2.8.361</Version>
-    <AssemblyVersion>2.8.361</AssemblyVersion>
+    <Version>2.9.369</Version>
+    <AssemblyVersion>2.9.369</AssemblyVersion>
     <FileVersion>$([System.DateTime]::Now.ToString("yyyy.M.d.HHmm"))</FileVersion>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>