diff --git a/Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved index 4e2003bb..d1bbfa6e 100644 --- a/Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/Passepartout.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -41,8 +41,7 @@ "kind" : "remoteSourceControl", "location" : "git@github.com:passepartoutvpn/passepartoutkit-source", "state" : { - "revision" : "126392d2614c9d0ffe2aa2d96f6c5509221b8481", - "version" : "0.9.0" + "revision" : "0bfd4578b71a905584cdd5c9c39ab3087521af78" } }, { diff --git a/Passepartout/Library/Package.swift b/Passepartout/Library/Package.swift index 6424430e..1bdabded 100644 --- a/Passepartout/Library/Package.swift +++ b/Passepartout/Library/Package.swift @@ -27,8 +27,8 @@ let package = Package( ) ], dependencies: [ - .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", from: "0.9.0"), -// .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", revision: "bec0635fe047e09c8b6c894d103ab8dd741b8340"), +// .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", from: "0.9.0"), + .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source", revision: "0bfd4578b71a905584cdd5c9c39ab3087521af78"), // .package(path: "../../../passepartoutkit-source"), .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source-openvpn-openssl", from: "0.8.0"), // .package(url: "git@github.com:passepartoutvpn/passepartoutkit-source-openvpn-openssl", revision: "031863a1cd683962a7dfe68e20b91fa820a1ecce"), diff --git a/Passepartout/Shared/Shared+App.swift b/Passepartout/Shared/Shared+App.swift index ec4060be..b6747de0 100644 --- a/Passepartout/Shared/Shared+App.swift +++ b/Passepartout/Shared/Shared+App.swift @@ -136,13 +136,14 @@ extension ProfileProcessor { } } - let processed = try builder.tryBuild() + let profile = try builder.tryBuild() do { - return try processed.withProviderModules() + _ = try profile.withProviderModules() + return profile } catch { // FIXME: #703, alert unable to build provider server pp_log(.app, .error, "Unable to inject provider modules: \(error)") - return processed + throw error } } } diff --git a/Passepartout/Tunnel/PacketTunnelProvider.swift b/Passepartout/Tunnel/PacketTunnelProvider.swift index 6287f926..96db2188 100644 --- a/Passepartout/Tunnel/PacketTunnelProvider.swift +++ b/Passepartout/Tunnel/PacketTunnelProvider.swift @@ -36,15 +36,16 @@ final class PacketTunnelProvider: NEPacketTunnelProvider, @unchecked Sendable { parameters: Constants.shared.log, logsPrivateData: UserDefaults.appGroup.bool(forKey: AppPreference.logsPrivateData.key) ) - fwd = try await NEPTPForwarder( - provider: self, - decoder: Registry.sharedProtocolCoder, - registry: .shared, - environment: .shared - ) do { + fwd = try await NEPTPForwarder( + provider: self, + decoder: Registry.sharedProtocolCoder, + registry: .shared, + environment: .shared + ) try await fwd?.startTunnel(options: options) } catch { + pp_log(.app, .fault, "Unable to start tunnel: \(error)") PassepartoutConfiguration.shared.flushLog() throw error }