Skip to content

Commit

Permalink
Publish v2.4.318
Browse files Browse the repository at this point in the history
  • Loading branch information
trudyhood committed Nov 16, 2022
2 parents cfb9aa8 + 842b8ed commit 51054f2
Show file tree
Hide file tree
Showing 49 changed files with 636 additions and 119 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# v2.4.318
### Client
* Feature: Show a message a device disconnected by your device
* Feature: Android TV support
* Update: Updating IP Location Database
* Update: Improve Client Battery Usage
* Update: Show SupportId (sid) to servers list
* Update: Remove Legacy AccessKey support
* Fix: Randomly select previous profile in UI

# v2.4.310
### Client
* Update: Removing Google Ads
Expand Down Expand Up @@ -419,6 +429,8 @@








Binary file modified Pub/Version.json
Binary file not shown.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,22 @@ It is available for Windows and Android. iOS client is not ready yet!
* Undetectable on private IPs
* Fast
* Split Tunneling by Apps & Countries
* Android TV
* IPv6 Support*

## Server Features
* No Network configuration or knowledge is required
* No Admin privilege is required
* Built-In User Management
* Built-In NAT with zero configuration
<<<<<<< HEAD
* Hot Restart
* Install on any Windows 7,8,10 or Windows Server
* Install on Linux
=======
* Run on any Windows 7,8,10,11 or Windows Server
* Run on Linux
>>>>>>> development
## Developer Features
* Open source (LGPL License)
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="VpnHood.Client">
<Version>2.4.303</Version>
<Version>2.4.315</Version>
</PackageReference>
<PackageReference Include="VpnHood.Client.Device.Android">
<Version>2.4.303</Version>
<Version>2.4.316</Version>
</PackageReference>
<PackageReference Include="Xamarin.Essentials" Version="1.7.3" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="VpnHood.Client" Version="2.4.303" />
<PackageReference Include="VpnHood.Client.Device.WinDivert" Version="2.4.303" />
<PackageReference Include="VpnHood.Client" Version="2.4.315" />
<PackageReference Include="VpnHood.Client.Device.WinDivert" Version="2.4.315" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions VpnHood.App.Launcher/VpnHood.App.Launcher.csproj
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<Authors>VpnHood</Authors>
<Company>VpnHood</Company>
<Copyright>2020 VpnHood</Copyright>
<Copyright>2022 VpnHood</Copyright>
<PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
Expand Down
Binary file modified VpnHood.Client.App.Android/Assets/SPA.zip
Binary file not shown.
5 changes: 3 additions & 2 deletions VpnHood.Client.App.Android/MainActivity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@ namespace VpnHood.Client.App.Android;

[Activity(Label = "@string/app_name",
Theme = "@android:style/Theme.DeviceDefault.NoActionBar",
Exported = true,
MainLauncher = true, AlwaysRetainTaskState = true, LaunchMode = LaunchMode.SingleInstance,
ScreenOrientation = ScreenOrientation.UserPortrait,
ScreenOrientation = ScreenOrientation.Unspecified,
ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.LayoutDirection |
ConfigChanges.Keyboard | ConfigChanges.KeyboardHidden | ConfigChanges.FontScale |
ConfigChanges.Locale | ConfigChanges.Navigation | ConfigChanges.UiMode)]
[IntentFilter(new[] { "android.intent.action.MAIN" }, Categories = new[] { "android.intent.category.LEANBACK_LAUNCHER" })]
[IntentFilter( new[] { Intent.ActionMain }, Categories = new[] { Intent.CategoryLauncher, Intent.CategoryLeanbackLauncher })]
public class MainActivity : Activity
{
private const int RequestVpnPermission = 10;
Expand Down
2 changes: 1 addition & 1 deletion VpnHood.Client.App.Android/Properties/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="310" package="com.vpnhood.client.android" android:installLocation="auto" android:versionName="2.4.310">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="318" package="com.vpnhood.client.android" android:installLocation="auto" android:versionName="2.4.318">
<uses-sdk android:minSdkVersion="22" android:targetSdkVersion="32" />
<uses-feature android:name="android.software.leanback" android:required="false" />
<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
Expand Down
2 changes: 1 addition & 1 deletion VpnHood.Client.App.Android/Resources/Resource.designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions VpnHood.Client.App.UI/VpnHood.Client.App.UI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
<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.4.310</Version>
<AssemblyVersion>2.4.310</AssemblyVersion>
<FileVersion>2.4.310</FileVersion>
<Version>2.4.318</Version>
<AssemblyVersion>2.4.318</AssemblyVersion>
<FileVersion>2.4.318</FileVersion>
<Nullable>enable</Nullable>
<LangVersion>10.0</LangVersion>
</PropertyGroup>
Expand All @@ -36,7 +36,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="EmbedIO" Version="3.5.0" />
<PackageReference Include="EmbedIO" Version="3.5.2" />
<PackageReference Include="Unosquare.Swan.Lite" Version="3.1.0" />
</ItemGroup>

Expand Down
Binary file modified VpnHood.Client.App.Win/Resources/SPA.zip
Binary file not shown.
8 changes: 4 additions & 4 deletions VpnHood.Client.App.Win/VpnHood.Client.App.Win.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
<ApplicationManifest>app.manifest</ApplicationManifest>
<PackageId>VpnHood.Client.App.Win</PackageId>
<StartupObject></StartupObject>
<Version>2.4.310</Version>
<AssemblyVersion>2.4.310</AssemblyVersion>
<FileVersion>2.4.310</FileVersion>
<Version>2.4.318</Version>
<AssemblyVersion>2.4.318</AssemblyVersion>
<FileVersion>2.4.318</FileVersion>
<Nullable>enable</Nullable>
<LangVersion>10.0</LangVersion>
<EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
Expand Down Expand Up @@ -58,7 +58,7 @@

<ItemGroup>
<PackageReference Include=" " Version="1.0.664.37" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1343.22" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1418.22" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions VpnHood.Client.App/AppState.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using VpnHood.Common.Messaging;

namespace VpnHood.Client.App;

Expand Down
6 changes: 3 additions & 3 deletions VpnHood.Client.App/Resource.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions VpnHood.Client.App/Resource.resx
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="IP2LOCATION_LITE_DB1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>resources\ip2location-lite-db1.zip;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="IP2LOCATION_LITE_DB1_CSV" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>Resources\IP2LOCATION-LITE-DB1.CSV.ZIP;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
</root>
Binary file modified VpnHood.Client.App/Resources/IP2LOCATION-LITE-DB1.CSV.ZIP
Binary file not shown.
Binary file not shown.
8 changes: 4 additions & 4 deletions VpnHood.Client.App/VpnHood.Client.App.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
<Authors>VpnHood</Authors>
<Company>VpnHood</Company>
<PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
<Copyright>2020 VpnHood</Copyright>
<Copyright>2022 VpnHood</Copyright>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
<PackageIcon>VpnHood.png</PackageIcon>
<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.4.310</Version>
<AssemblyVersion>2.4.310</AssemblyVersion>
<FileVersion>2.4.310</FileVersion>
<Version>2.4.318</Version>
<AssemblyVersion>2.4.318</AssemblyVersion>
<FileVersion>2.4.318</FileVersion>
<Nullable>enable</Nullable>
<LangVersion>10.0</LangVersion>
</PropertyGroup>
Expand Down
14 changes: 9 additions & 5 deletions VpnHood.Client.App/VpnHoodApp.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,14 @@ public class VpnHoodApp : IDisposable, IIpFilter
private IpGroupManager? _ipGroupManager;
private bool _isConnecting;
private bool _isDisconnecting;
private SessionStatus? _lastSessionStatus;
private Exception? _lastException;
private StreamLogger? _streamLogger;
private IpGroup? _lastClientIpGroup;
private VpnHoodClient? Client => ClientConnect?.Client;
private string? LastError => _lastException?.Message ?? Client?.SessionStatus.ErrorMessage;

private SessionStatus? LastSessionStatus => Client?.SessionStatus ?? _lastSessionStatus;
private string? LastError => _lastException?.Message ?? LastSessionStatus?.ErrorMessage;

private AppConnectionState _lastConnectionState;
public event EventHandler? ConnectionStateChanged;
Expand Down Expand Up @@ -116,7 +119,7 @@ private VpnHoodApp(IAppProvider clientAppProvider, AppOptions? options = default
HasDiagnoseStarted = _hasDiagnoseStarted,
HasDisconnectedByUser = _hasDisconnectedByUser,
HasProblemDetected = _hasConnectRequested && IsIdle && (_hasDiagnoseStarted || LastError != null),
SessionStatus = Client?.SessionStatus,
SessionStatus = LastSessionStatus,
ReceiveSpeed = Client?.ReceiveSpeed ?? 0,
ReceivedTraffic = Client?.ReceivedByteCount ?? 0,
SendSpeed = Client?.SendSpeed ?? 0,
Expand Down Expand Up @@ -197,7 +200,7 @@ private void Device_OnStartAsService(object sender, EventArgs e)
x.ClientProfileId == UserSettings.DefaultClientProfileId) ?? ClientProfileStore.ClientProfiles.FirstOrDefault();
if (clientProfile == null) throw new Exception("There is no default configuration!");

var _ = Connect(clientProfile.ClientProfileId);
_ = Connect(clientProfile.ClientProfileId);
}

public string GetLogForReport()
Expand Down Expand Up @@ -507,9 +510,10 @@ public void Disconnect(bool byUser = false)
finally
{
ActiveClientProfile = null;
ClientConnect = null;
_lastSessionStatus = ClientConnect?.Client?.SessionStatus;
_isConnecting = false;
_isDisconnecting = false;
ClientConnect = null;
CheckConnectionStateChanged();
}
}
Expand All @@ -530,7 +534,7 @@ private async Task<IpGroupManager> GetIpGroupManager()
var ipGroupsPath = Path.Combine(AppDataFolderPath, "Temp", "ipgroups");

// AddFromIp2Location if hash has been changed
await using var memZipStream = new MemoryStream(Resource.IP2LOCATION_LITE_DB1);
await using var memZipStream = new MemoryStream(Resource.IP2LOCATION_LITE_DB1_CSV);
memZipStream.Seek(0, SeekOrigin.Begin);
using var md5 = MD5.Create();
var hash = md5.ComputeHash(memZipStream);
Expand Down
8 changes: 4 additions & 4 deletions VpnHood.Client.Device.Android/AppVpnService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@

namespace VpnHood.Client.Device.Android
{
[Service(Label = VpnServiceName, Permission = Manifest.Permission.BindVpnService, Exported =false)]
[Service(Permission = Manifest.Permission.BindVpnService, Exported =false)]
[IntentFilter(new[] { "android.net.VpnService" })]
internal class AppVpnService : VpnService, IPacketCapture
public class AppVpnService : VpnService, IPacketCapture
{
public const string VpnServiceName = "VpnHood";
public const string VpnServiceName = "VpnHood22";
private IPAddress[]? _dnsServers = { IPAddress.Parse("8.8.8.8"), IPAddress.Parse("8.8.4.4") };
private FileInputStream? _inStream; // Packets to be sent are queued in this input stream.
private ParcelFileDescriptor? _mInterface;
Expand Down Expand Up @@ -294,4 +294,4 @@ private void Close()

#endregion
}
}
}
2 changes: 1 addition & 1 deletion VpnHood.Client.Device.Android/Nuget/nuget.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<licenseUrl>https://licenses.nuget.org/LGPL-2.1-only</licenseUrl>
<projectUrl>https://github.com/vpnhood/vpnhood</projectUrl>
<description>VpnHood client device provider for Android using Android VpnService.</description>
<copyright>2020 VpnHood</copyright>
<copyright>2022 VpnHood</copyright>
<repository url="https://github.com/vpnhood/vpnhood" />
<icon>VpnHood.png</icon>
<tags>VPN Android</tags>
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
<Version>6.0.2</Version>
</PackageReference>
<PackageReference Include="PacketDotNet">
<Version>1.4.6</Version>
<Version>1.4.7</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
<Authors>VpnHood</Authors>
<Company>VpnHood</Company>
<PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
<Copyright>2020 VpnHood</Copyright>
<Copyright>2022 VpnHood</Copyright>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
<PackageIcon>VpnHood.png</PackageIcon>
<Description>VpnHood client device provider for Windows using WinDivert.</Description>
<Version>2.4.310</Version>
<Version>2.4.318</Version>
<PackageId>VpnHood.Client.Device.WinDivert</PackageId>
<Version>1.1.226</Version>
<AssemblyVersion>2.4.310</AssemblyVersion>
<FileVersion>2.4.310</FileVersion>
<AssemblyVersion>2.4.318</AssemblyVersion>
<FileVersion>2.4.318</FileVersion>
<Nullable>enable</Nullable>
<LangVersion>10.0</LangVersion>
</PropertyGroup>
Expand All @@ -29,7 +29,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="SharpPcap" Version="6.2.2" />
<PackageReference Include="SharpPcap" Version="6.2.5" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions VpnHood.Client.Device/VpnHood.Client.Device.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
<Authors>VpnHood</Authors>
<Description>VpnHood Device abstraction</Description>
<PackageLicenseExpression>LGPL-2.1-only</PackageLicenseExpression>
<Copyright>2020 VpnHood</Copyright>
<Copyright>2022 VpnHood</Copyright>
<PackageProjectUrl>https://github.com/vpnhood/vpnhood</PackageProjectUrl>
<PackageIcon>VpnHood.png</PackageIcon>
<RepositoryUrl>https://github.com/vpnhood/vpnhood</RepositoryUrl>
<RepositoryType></RepositoryType>
<PackageId>VpnHood.Client.Device</PackageId>
<RootNamespace>VpnHood.Client.Device</RootNamespace>
<Version>2.4.310</Version>
<AssemblyVersion>2.4.310</AssemblyVersion>
<FileVersion>2.4.310</FileVersion>
<Version>2.4.318</Version>
<AssemblyVersion>2.4.318</AssemblyVersion>
<FileVersion>2.4.318</FileVersion>
<Nullable>enable</Nullable>
<LangVersion>10.0</LangVersion>
</PropertyGroup>
Expand All @@ -33,7 +33,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="PacketDotNet" Version="1.4.6" />
<PackageReference Include="PacketDotNet" Version="1.4.7" />
<PackageReference Include="System.Text.Json" Version="6.0.6" />
</ItemGroup>

Expand Down
Loading

0 comments on commit 51054f2

Please sign in to comment.