1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
|
import { connect } from 'react-redux';
import { RouteComponentProps, withRouter } from 'react-router';
import {
BridgeState,
IDnsOptions,
RelayProtocol,
TunnelProtocol,
} from '../../shared/daemon-rpc-types';
import log from '../../shared/logging';
import RelaySettingsBuilder from '../../shared/relay-settings-builder';
import AdvancedSettings from '../components/AdvancedSettings';
import withAppContext, { IAppContext } from '../context';
import { RelaySettingsRedux } from '../redux/settings/reducers';
import { IReduxState, ReduxDispatch } from '../redux/store';
const mapStateToProps = (state: IReduxState) => {
const protocolAndPort = mapRelaySettingsToProtocolAndPort(state.settings.relaySettings);
return {
enableIpv6: state.settings.enableIpv6,
blockWhenDisconnected: state.settings.blockWhenDisconnected,
wireguardKeyState: state.settings.wireguardKeyState,
mssfix: state.settings.openVpn.mssfix,
wireguardMtu: state.settings.wireguard.mtu,
bridgeState: state.settings.bridgeState,
dns: state.settings.dns,
...protocolAndPort,
};
};
const mapRelaySettingsToProtocolAndPort = (relaySettings: RelaySettingsRedux) => {
if ('normal' in relaySettings) {
const { tunnelProtocol, openvpn, wireguard } = relaySettings.normal;
return {
openvpn: {
protocol: openvpn.protocol === 'any' ? undefined : openvpn.protocol,
port: openvpn.port === 'any' ? undefined : openvpn.port,
},
wireguard: { port: wireguard.port === 'any' ? undefined : wireguard.port },
tunnelProtocol: tunnelProtocol === 'any' ? undefined : tunnelProtocol,
};
// since the GUI doesn't display custom settings, just display the default ones.
// If the user sets any settings, then those will be applied.
} else if ('customTunnelEndpoint' in relaySettings) {
return {
openvpn: {
protocol: undefined,
port: undefined,
},
wireguard: { port: undefined },
tunnelProtocol: undefined,
};
} else {
throw new Error('Unknown type of relay settings.');
}
};
const mapDispatchToProps = (_dispatch: ReduxDispatch, props: RouteComponentProps & IAppContext) => {
return {
onClose: () => {
props.history.goBack();
},
setOpenVpnRelayProtocolAndPort: async (protocol?: RelayProtocol, port?: number) => {
const relayUpdate = RelaySettingsBuilder.normal()
.tunnel.openvpn((openvpn) => {
if (protocol) {
openvpn.protocol.exact(protocol);
} else {
openvpn.protocol.any();
}
if (port) {
openvpn.port.exact(port);
} else {
openvpn.port.any();
}
})
.build();
try {
await props.app.updateRelaySettings(relayUpdate);
} catch (e) {
log.error('Failed to update relay settings', e.message);
}
},
setWireguardRelayPort: async (port?: number) => {
const relayUpdate = RelaySettingsBuilder.normal()
.tunnel.wireguard((wireguard) => {
if (port) {
wireguard.port.exact(port);
} else {
wireguard.port.any();
}
})
.build();
try {
await props.app.updateRelaySettings(relayUpdate);
} catch (e) {
log.error('Failed to update relay settings', e.message);
}
},
setTunnelProtocol: async (tunnelProtocol: TunnelProtocol | undefined) => {
const relayUpdate = RelaySettingsBuilder.normal()
.tunnel.tunnelProtocol((config) => {
if (tunnelProtocol) {
config.tunnelProtocol.exact(tunnelProtocol);
} else {
config.tunnelProtocol.any();
}
})
.build();
try {
await props.app.updateRelaySettings(relayUpdate);
} catch (e) {
log.error('Failed to update tunnel protocol constraints', e.message);
}
},
setEnableIpv6: async (enableIpv6: boolean) => {
try {
await props.app.setEnableIpv6(enableIpv6);
} catch (e) {
log.error('Failed to update enable IPv6', e.message);
}
},
setBlockWhenDisconnected: async (blockWhenDisconnected: boolean) => {
try {
await props.app.setBlockWhenDisconnected(blockWhenDisconnected);
} catch (e) {
log.error('Failed to update block when disconnected', e.message);
}
},
setBridgeState: async (bridgeState: BridgeState) => {
try {
await props.app.setBridgeState(bridgeState);
} catch (e) {
log.error(`Failed to update bridge state: ${e.message}`);
}
},
setOpenVpnMssfix: async (mssfix?: number) => {
try {
await props.app.setOpenVpnMssfix(mssfix);
} catch (e) {
log.error('Failed to update mssfix value', e.message);
}
},
setWireguardMtu: async (mtu?: number) => {
try {
await props.app.setWireguardMtu(mtu);
} catch (e) {
log.error('Failed to update mtu value', e.message);
}
},
setDnsOptions: (dns: IDnsOptions) => {
return props.app.setDnsOptions(dns);
},
onViewWireguardKeys: () => props.history.push('/settings/advanced/wireguard-keys'),
onViewLinuxSplitTunneling: () => props.history.push('/settings/advanced/linux-split-tunneling'),
};
};
export default withAppContext(
withRouter(connect(mapStateToProps, mapDispatchToProps)(AdvancedSettings)),
);
|
