diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2019-06-05 13:29:16 +0100 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2019-06-05 13:29:16 +0100 |
| commit | e320c6657d13a84f381dec91840a62d31c47611d (patch) | |
| tree | 2886e2a08afa81488a4b31cbfd69362b91f915a0 /gui/src/main | |
| parent | 7618e831837bbed460b41282f70de45164b1946b (diff) | |
| parent | 441c98e3e72bf43020397cd009cfab0754dc4810 (diff) | |
| download | mullvadvpn-e320c6657d13a84f381dec91840a62d31c47611d.tar.xz mullvadvpn-e320c6657d13a84f381dec91840a62d31c47611d.zip | |
Merge branch 'add-bridge-to-tunnel-endpoint'
Diffstat (limited to 'gui/src/main')
| -rw-r--r-- | gui/src/main/daemon-rpc.ts | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts index bd76896569..86ef3dff0a 100644 --- a/gui/src/main/daemon-rpc.ts +++ b/gui/src/main/daemon-rpc.ts @@ -240,6 +240,13 @@ const tunnelStateTransitionSchema = oneOf( address: string, protocol: enumeration('tcp', 'udp'), tunnel_type: enumeration('wireguard', 'openvpn'), + proxy: maybe( + partialObject({ + address: string, + protocol: enumeration('tcp', 'udp'), + proxy_type: enumeration('shadowsocks', 'custom'), + }), + ), }), }), object({ |