diff options
Diffstat (limited to 'gui/src/main')
| -rw-r--r-- | gui/src/main/daemon-rpc.ts | 23 | ||||
| -rw-r--r-- | gui/src/main/index.ts | 13 |
2 files changed, 18 insertions, 18 deletions
diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts index e317ffb794..24671fac23 100644 --- a/gui/src/main/daemon-rpc.ts +++ b/gui/src/main/daemon-rpc.ts @@ -101,21 +101,14 @@ const relaySettingsSchema = oneOf( object({ normal: partialObject({ location: locationConstraintSchema, - tunnel: constraint( - oneOf( - object({ - openvpn: partialObject({ - port: constraint(number), - protocol: constraint(enumeration('udp', 'tcp')), - }), - }), - object({ - wireguard: partialObject({ - port: constraint(number), - }), - }), - ), - ), + tunnel_protocol: constraint(enumeration('wireguard', 'openvpn')), + wireguard_constraints: partialObject({ + port: constraint(number), + }), + openvpn_constraints: partialObject({ + port: constraint(number), + protocol: constraint(enumeration('udp', 'tcp')), + }), }), }), object({ diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts index a0dcbeb50b..1d766629cf 100644 --- a/gui/src/main/index.ts +++ b/gui/src/main/index.ts @@ -83,7 +83,14 @@ class ApplicationMain { relaySettings: { normal: { location: 'any', - tunnel: 'any', + tunnelProtocol: 'any', + openvpnConstraints: { + port: 'any', + protocol: 'any', + }, + wireguardConstraints: { + port: 'any', + }, }, }, bridgeSettings: { @@ -611,8 +618,8 @@ class ApplicationMain { let fnHasWantedTunnels = hasOpenVpnTunnels; if ('normal' in relaySettings) { - const tunnelConstraints = relaySettings.normal.tunnel; - if (tunnelConstraints !== 'any' && 'wireguard' in tunnelConstraints.only) { + const tunnelConstraints = relaySettings.normal.tunnelProtocol; + if (tunnelConstraints !== 'any' && 'wireguard' === tunnelConstraints.only) { fnHasWantedTunnels = hasWireguardTunnels; } } |