passepartoutvpn
/
passepartout-apple
mirror of https://github.com/passepartoutvpn/passepartout-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix access to hidden OpenVPN.Configuration.Fallback

This commit is contained in:
Davide De Rosa 2022-09-23 22:40:57 +02:00
parent be6726fbd8
commit a3fd5c40d4
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Passepartout/App/Views/EndpointAdvancedView+OpenVPN.swift
View File

@ -35,6 +35,8 @@ extension EndpointAdvancedView {
let isServerPushed: Bool let isServerPushed: Bool
private let fallbackConfiguration = OpenVPN.ConfigurationBuilder(withFallbacks: true).build()
var body: some View { var body: some View {
List { List {
let cfg = builder.build() let cfg = builder.build()
@ -134,13 +136,13 @@ extension EndpointAdvancedView.OpenVPNView {
Section { Section {
themeTextPicker( themeTextPicker(
L10n.Endpoint.Advanced.Openvpn.Items.Cipher.caption, L10n.Endpoint.Advanced.Openvpn.Items.Cipher.caption,
selection: $builder.cipher ?? OpenVPN.Configuration.Fallback.cipher, selection: $builder.cipher ?? fallbackCipher,
values: OpenVPN.Cipher.available, values: OpenVPN.Cipher.available,
description: \.localizedDescription description: \.localizedDescription
) )
themeTextPicker( themeTextPicker(
L10n.Endpoint.Advanced.Openvpn.Items.Digest.caption, L10n.Endpoint.Advanced.Openvpn.Items.Digest.caption,
selection: $builder.digest ?? OpenVPN.Configuration.Fallback.digest, selection: $builder.digest ?? fallbackDigest,
values: OpenVPN.Digest.available, values: OpenVPN.Digest.available,
description: \.localizedDescription description: \.localizedDescription
) )
@ -174,13 +176,13 @@ extension EndpointAdvancedView.OpenVPNView {
Section { Section {
themeTextPicker( themeTextPicker(
L10n.Endpoint.Advanced.Openvpn.Items.CompressionFraming.caption, L10n.Endpoint.Advanced.Openvpn.Items.CompressionFraming.caption,
selection: $builder.compressionFraming ?? OpenVPN.Configuration.Fallback.compressionFraming, selection: $builder.compressionFraming ?? fallbackCompressionFraming,
values: OpenVPN.CompressionFraming.available, values: OpenVPN.CompressionFraming.available,
description: \.localizedDescription description: \.localizedDescription
) )
themeTextPicker( themeTextPicker(
L10n.Endpoint.Advanced.Openvpn.Items.CompressionAlgorithm.caption, L10n.Endpoint.Advanced.Openvpn.Items.CompressionAlgorithm.caption,
selection: $builder.compressionAlgorithm ?? OpenVPN.Configuration.Fallback.compressionAlgorithm, selection: $builder.compressionAlgorithm ?? fallbackCompressionAlgorithm,
values: OpenVPN.CompressionAlgorithm.available, values: OpenVPN.CompressionAlgorithm.available,
description: \.localizedDescription description: \.localizedDescription
).disabled(builder.compressionFraming == .disabled) ).disabled(builder.compressionFraming == .disabled)
@ -319,3 +321,21 @@ extension OpenVPN.Configuration {
return (keepAliveInterval, renegotiatesAfter, randomizeEndpoint) return (keepAliveInterval, renegotiatesAfter, randomizeEndpoint)
} }
} }
private extension EndpointAdvancedView.OpenVPNView {
var fallbackCipher: OpenVPN.Cipher {
fallbackConfiguration.cipher!
}
var fallbackDigest: OpenVPN.Digest {
fallbackConfiguration.digest!
}
var fallbackCompressionFraming: OpenVPN.CompressionFraming {
fallbackConfiguration.compressionFraming!
}
var fallbackCompressionAlgorithm: OpenVPN.CompressionAlgorithm {
fallbackConfiguration.compressionAlgorithm!
}
}