summaryrefslogtreecommitdiffhomepage
path: root/gui/src/renderer/containers
diff options
context:
space:
mode:
authorOskar Nyberg <oskar@mullvad.net>2022-01-19 14:48:23 +0100
committerOskar Nyberg <oskar@mullvad.net>2022-01-24 09:52:41 +0100
commit6e2e91137ca688717cd2efab6f55c92037da0887 (patch)
tree31e97ea0d7f1f7c80a9a27fadc0c06f4e0c77eb4 /gui/src/renderer/containers
parentecf45a3a01084771c7c5fe5d0a8f5b1f80f8f7bb (diff)
downloadmullvadvpn-6e2e91137ca688717cd2efab6f55c92037da0887.tar.xz
mullvadvpn-6e2e91137ca688717cd2efab6f55c92037da0887.zip
Add requirements for UDP and bridge mode
Diffstat (limited to 'gui/src/renderer/containers')
-rw-r--r--gui/src/renderer/containers/OpenVPNSettingsPage.tsx11
1 files changed, 9 insertions, 2 deletions
diff --git a/gui/src/renderer/containers/OpenVPNSettingsPage.tsx b/gui/src/renderer/containers/OpenVPNSettingsPage.tsx
index 9885afe971..e8033a2d70 100644
--- a/gui/src/renderer/containers/OpenVPNSettingsPage.tsx
+++ b/gui/src/renderer/containers/OpenVPNSettingsPage.tsx
@@ -2,7 +2,7 @@ import { connect } from 'react-redux';
import { BridgeState, RelayProtocol } from '../../shared/daemon-rpc-types';
import log from '../../shared/logging';
import RelaySettingsBuilder from '../../shared/relay-settings-builder';
-import OpenVPNSettings from '../components/OpenVPNSettings';
+import OpenVPNSettings, { BridgeModeAvailability } from '../components/OpenVPNSettings';
import withAppContext, { IAppContext } from '../context';
import { IHistoryProps, withHistory } from '../lib/history';
@@ -12,8 +12,15 @@ import { IReduxState, ReduxDispatch } from '../redux/store';
const mapStateToProps = (state: IReduxState) => {
const protocolAndPort = mapRelaySettingsToProtocolAndPort(state.settings.relaySettings);
+ let bridgeModeAvailablity = BridgeModeAvailability.available;
+ if (mapRelaySettingsToProtocol(state.settings.relaySettings) !== 'openvpn') {
+ bridgeModeAvailablity = BridgeModeAvailability.blockedDueToTunnelProtocol;
+ } else if (protocolAndPort.openvpn.protocol === 'udp') {
+ bridgeModeAvailablity = BridgeModeAvailability.blockedDueToTransportProtocol;
+ }
+
return {
- tunnelProtocolIsOpenVpn: mapRelaySettingsToProtocol(state.settings.relaySettings) === 'openvpn',
+ bridgeModeAvailablity,
mssfix: state.settings.openVpn.mssfix,
bridgeState: state.settings.bridgeState,
...protocolAndPort,