diff --git a/CHANGELOG.md b/CHANGELOG.md index 40226f4a..36b17bf2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## 1.11.0 Beta 2279 (2020-02-28) +## Unreleased ### Changed @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Programming error in some SoftEther negotiation (Grivus). [tunnelkit#143](https://github.com/passepartoutvpn/tunnelkit/pull/143) - Default gateway not yet enforced for providers (e.g. TunnelBear). [passepartout-core-apple#4](https://github.com/passepartoutvpn/passepartout-core-apple/pull/4) - Active profile lost after renaming. [#128](https://github.com/passepartoutvpn/passepartout-ios/issues/128) +- Handle server shutdown/restart (remote `--explicit-exit-notify`). [tunnelkit#131](https://github.com/passepartoutvpn/tunnelkit/issues/131) ## 1.10.1 (2019-12-24) diff --git a/Passepartout-iOS/Global/SwiftGen+Strings.swift b/Passepartout-iOS/Global/SwiftGen+Strings.swift index a77de682..29b74859 100644 --- a/Passepartout-iOS/Global/SwiftGen+Strings.swift +++ b/Passepartout-iOS/Global/SwiftGen+Strings.swift @@ -1032,6 +1032,8 @@ internal enum L10n { internal static let network = L10n.tr("Core", "vpn.errors.network") /// Missing routing internal static let routing = L10n.tr("Core", "vpn.errors.routing") + /// Server shutdown + internal static let shutdown = L10n.tr("Core", "vpn.errors.shutdown") /// Timeout internal static let timeout = L10n.tr("Core", "vpn.errors.timeout") /// TLS failed diff --git a/Passepartout-iOS/Global/Theme+Cells.swift b/Passepartout-iOS/Global/Theme+Cells.swift index 4cddcbcc..63366235 100644 --- a/Passepartout-iOS/Global/Theme+Cells.swift +++ b/Passepartout-iOS/Global/Theme+Cells.swift @@ -145,6 +145,9 @@ extension SettingTableViewCell { case .gatewayUnattainable: disconnectionReason = L10n.Core.Vpn.Errors.gateway + case .serverShutdown: + disconnectionReason = L10n.Core.Vpn.Errors.shutdown + default: break } diff --git a/Podfile b/Podfile index 5bdd173d..b3d5bdc2 100644 --- a/Podfile +++ b/Podfile @@ -9,7 +9,7 @@ $tunnelkit_specs = ['Protocols/OpenVPN', 'Extra/LZO'] def shared_pods #pod_version $tunnelkit_name, $tunnelkit_specs, '~> 2.2.1' - pod_git $tunnelkit_name, $tunnelkit_specs, 'a7aa781' + pod_git $tunnelkit_name, $tunnelkit_specs, '8825a4e' #pod_path $tunnelkit_name, $tunnelkit_specs, '..' pod 'SSZipArchive' diff --git a/Podfile.lock b/Podfile.lock index b3be17de..53a2c2a1 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -49,8 +49,8 @@ DEPENDENCIES: - Kvitto - MBProgressHUD - SSZipArchive - - TunnelKit/Extra/LZO (from `https://github.com/passepartoutvpn/tunnelkit`, commit `a7aa781`) - - TunnelKit/Protocols/OpenVPN (from `https://github.com/passepartoutvpn/tunnelkit`, commit `a7aa781`) + - TunnelKit/Extra/LZO (from `https://github.com/passepartoutvpn/tunnelkit`, commit `8825a4e`) + - TunnelKit/Protocols/OpenVPN (from `https://github.com/passepartoutvpn/tunnelkit`, commit `8825a4e`) SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -66,7 +66,7 @@ EXTERNAL SOURCES: :commit: 3a191e8 :git: https://github.com/keeshux/convenience TunnelKit: - :commit: a7aa781 + :commit: 8825a4e :git: https://github.com/passepartoutvpn/tunnelkit CHECKOUT OPTIONS: @@ -74,7 +74,7 @@ CHECKOUT OPTIONS: :commit: 3a191e8 :git: https://github.com/keeshux/convenience TunnelKit: - :commit: a7aa781 + :commit: 8825a4e :git: https://github.com/passepartoutvpn/tunnelkit SPEC CHECKSUMS: @@ -87,6 +87,6 @@ SPEC CHECKSUMS: SwiftyBeaver: f9a9aba96a6a6166e21682377804d728b0d20b95 TunnelKit: 1733ed87934deb57edc7aa5f4b25185bf302a7d4 -PODFILE CHECKSUM: ba2c98caa7750c7d26813abd7faa3b189e90d45c +PODFILE CHECKSUM: bfe97510ab2b83cac0e2e1e353ecc2545f24d5ae COCOAPODS: 1.8.4 diff --git a/Submodules/Core b/Submodules/Core index 47913267..045ff931 160000 --- a/Submodules/Core +++ b/Submodules/Core @@ -1 +1 @@ -Subproject commit 479132676b5de9c746f369338d53f32e769cf794 +Subproject commit 045ff9316aaef45ec4358107597f101ac213cfe6