diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2019-09-02 16:24:51 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2019-09-02 16:34:01 +0200 |
| commit | 31ae28ff4f619f47fd364ff601dec648e8d27226 (patch) | |
| tree | 7de555d471d67485d8c420583941b0a69e579398 | |
| parent | 4fdd915587a966fc77bbd61df7a26578615419bf (diff) | |
| download | mullvadvpn-31ae28ff4f619f47fd364ff601dec648e8d27226.tar.xz mullvadvpn-31ae28ff4f619f47fd364ff601dec648e8d27226.zip | |
Add set_bridge_settings RPC call
| -rw-r--r-- | gui/src/main/daemon-rpc.ts | 5 | ||||
| -rw-r--r-- | gui/src/main/index.ts | 4 | ||||
| -rw-r--r-- | gui/src/shared/daemon-rpc-types.ts | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts index 481833e0ac..0a55833731 100644 --- a/gui/src/main/daemon-rpc.ts +++ b/gui/src/main/daemon-rpc.ts @@ -1,5 +1,6 @@ import { AccountToken, + BridgeSettings, BridgeState, DaemonEvent, IAccountData, @@ -449,6 +450,10 @@ export class DaemonRpc { await this.transport.send('set_bridge_state', [bridgeState]); } + public async setBridgeSettings(bridgeSettings: BridgeSettings): Promise<void> { + await this.transport.send('set_bridge_settings', [bridgeSettings]); + } + public async setOpenVpnMssfix(mssfix?: number): Promise<void> { await this.transport.send('set_openvpn_mssfix', [mssfix]); } diff --git a/gui/src/main/index.ts b/gui/src/main/index.ts index c93f0f89d7..87d0de1d2e 100644 --- a/gui/src/main/index.ts +++ b/gui/src/main/index.ts @@ -101,7 +101,9 @@ class ApplicationMain { }, }, bridgeSettings: { - location: 'any', + normal: { + location: 'any', + }, }, bridgeState: 'auto', tunnelOptions: { diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts index 61a0263031..f88cd29404 100644 --- a/gui/src/shared/daemon-rpc-types.ts +++ b/gui/src/shared/daemon-rpc-types.ts @@ -311,7 +311,7 @@ export interface IBridgeConstraints { }; } -export type BridgeSettings = ProxySettings | IBridgeConstraints; +export type BridgeSettings = { normal: IBridgeConstraints } | { custom: ProxySettings }; export interface ISocketAddress { host: string; |