Merge branch 'release/3.5.0'

Author: Mindaugas Veblauskas

Setup/Native/arm64/ProtonVPN.CalloutDriver.inf

@@ -8,7 +8,8 @@ Class       = WFPCALLOUTS
 ClassGuid   = {57465043-616C-6C6F-7574-5F636C617373}
 Provider    = %ManufacturerName%
 CatalogFile = ProtonVPN.CalloutDriver.cat
-DriverVer = 08/19/2024,15.41.59.712
+DriverVer = 11/19/2024,7.43.45.10
+PnpLockdown = 1
 
 [SourceDisksNames]
 1 = %DiskName%,,,""
@@ -26,7 +27,7 @@ CopyFiles  = ProtonVPN.CalloutDriver.Files
 
 [DefaultUninstall.NTARM64]
 LegacyUninstall = 1
-DelFiles = ProtonVPN.CalloutDriver.Files
+;DelFiles = ProtonVPN.CalloutDriver.Files
 
 [DefaultInstall.NTARM64.Services]
 AddService = %ServiceName%,,ProtonVPN.CalloutDriver.Service

Setup/Native/arm64/ProtonVPN.CalloutDriver.sys

@@ -8,7 +8,8 @@ Class       = WFPCALLOUTS
 ClassGuid   = {57465043-616C-6C6F-7574-5F636C617373}
 Provider    = %ManufacturerName%
 CatalogFile = ProtonVPN.CalloutDriver.cat
-DriverVer = 01/26/2021,18.36.11.107
+DriverVer = 11/19/2024,11.46.44.670
+PnpLockdown = 1
 
 [SourceDisksNames]
 1 = %DiskName%,,,""
@@ -26,7 +27,7 @@ CopyFiles  = ProtonVPN.CalloutDriver.Files
 
 [DefaultUninstall.NTamd64]
 LegacyUninstall = 1
-DelFiles = ProtonVPN.CalloutDriver.Files
+;DelFiles = ProtonVPN.CalloutDriver.Files
 
 [DefaultInstall.NTamd64.Services]
 AddService = %ServiceName%,,ProtonVPN.CalloutDriver.Service

Setup/Native/arm64/protonvpn.calloutdriver.cat

@@ -602,7 +602,7 @@ var
 begin
   SetSilentModes();
   SetIsToDisableAutoUpdate();
-  if IsWindowsVersionEqualOrHigher(10, 0, 17763) = False then begin
+  if IsWindowsVersionEqualOrHigher(10, 0, 19041) = False then begin
     if WizardSilent() = false then begin
       MsgBox('This application does not support your Windows version. You will be redirected to a download page with an application suitable for your Windows version. ', mbInformation, MB_OK);
       ShellExec('open', 'https://protonvpn.com/free-vpn/windows/windows7', '', '', SW_SHOW, ewNoWait, ErrCode);

Setup/Native/x64/ProtonVPN.CalloutDriver.inf

@@ -45,13 +45,13 @@ public interface IApiClient : IClientBase
         Task<ApiResponseResult<PhysicalServerWrapperResponse>> GetServerAsync(string serverId);
         Task<ApiResponseResult<VpnInfoWrapperResponse>> GetVpnInfoResponse();
         Task<ApiResponseResult<BaseResponse>> GetLogoutResponse();
-        Task<ApiResponseResult<ServersResponse>> GetServersAsync(string ip);
+        Task<ApiResponseResult<ServersResponse>> GetServersAsync(string countryCode, string ip);
         Task<ApiResponseResult<ReportAnIssueFormResponse>> GetReportAnIssueFormData();
-        Task<ApiResponseResult<ServersResponse>> GetServerLoadsAsync(string ip);
+        Task<ApiResponseResult<ServersResponse>> GetServerLoadsAsync(string countryCode, string ip);
         Task<ApiResponseResult<UserLocationResponse>> GetLocationDataAsync();
         Task<ApiResponseResult<BaseResponse>> ReportBugAsync(IEnumerable<KeyValuePair<string, string>> fields, IEnumerable<File> files);
         Task<ApiResponseResult<SessionsResponse>> GetSessions();
-        Task<ApiResponseResult<VpnConfigResponse>> GetVpnConfig(string country, string ip);
+        Task<ApiResponseResult<VpnConfigResponse>> GetVpnConfig(string countryCode, string ip);
         Task<ApiResponseResult<AnnouncementsResponse>> GetAnnouncementsAsync(AnnouncementsRequest request);
         Task<ApiResponseResult<StreamingServicesResponse>> GetStreamingServicesAsync();
         Task<ApiResponseResult<BaseResponse>> CheckAuthenticationServerStatusAsync();

Setup/Native/x64/ProtonVPN.CalloutDriver.sys

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Proton AG
+ * Copyright (c) 2024 Proton AG
  *
  * This file is part of ProtonVPN.
  *
@@ -17,11 +17,13 @@
  * along with ProtonVPN.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-namespace ProtonVPN.Vpn.Networks
+using Newtonsoft.Json;
+
+namespace ProtonVPN.Api.Contracts.Servers
 {
-    public interface INetworkAdapterManager
+    public class EntryPerProtocolEntryResponse
     {
-        int DisableDuplicatedWireGuardAdapters();
-        int EnableOpenVpnAdapters();
+        [JsonProperty("IPv4")]
+        public string Ipv4 { get; set; }
     }
-}
+}

Setup/Native/x64/protonvpn.calloutdriver.cat

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Proton AG
+ * Copyright (c) 2024 Proton AG
  *
  * This file is part of ProtonVPN.
  *
@@ -17,24 +17,25 @@
  * along with ProtonVPN.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-using System.Collections.Generic;
-using System.Management;
+using Newtonsoft.Json;
 
-namespace ProtonVPN.Vpn.Networks.Adapters
+namespace ProtonVPN.Api.Contracts.Servers
 {
-    public class NetworkAdaptersLoader : INetworkAdaptersLoader
+    public class EntryPerProtocolResponse
     {
-        public IList<INetworkAdapter> GetAll()
-        {
-            SelectQuery query = new("Win32_NetworkAdapter");
-            ManagementObjectSearcher search = new(query);
-            IList<INetworkAdapter> networkAdapters = new List<INetworkAdapter>();
-            foreach (ManagementObject result in search.Get())
-            {
-                networkAdapters.Add(new NetworkAdapter(result));
-            }
+        [JsonProperty("WireGuardUDP")]
+        public EntryPerProtocolEntryResponse WireGuardUdp { get; set; }
 
-            return networkAdapters;
-        }
+        [JsonProperty("WireGuardTCP")]
+        public EntryPerProtocolEntryResponse WireGuardTcp { get; set; }
+
+        [JsonProperty("WireGuardTLS")]
+        public EntryPerProtocolEntryResponse WireGuardTls { get; set; }
+
+        [JsonProperty("OpenVPNUDP")]
+        public EntryPerProtocolEntryResponse OpenVpnUdp { get; set; }
+
+        [JsonProperty("OpenVPNTCP")]
+        public EntryPerProtocolEntryResponse OpenVpnTcp { get; set; }
     }
-}
+}