summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEmīls Piņķis <emils@mullvad.net>2019-06-04 20:34:22 +0100
committerEmīls Piņķis <emils@mullvad.net>2019-06-05 13:16:04 +0100
commit441c98e3e72bf43020397cd009cfab0754dc4810 (patch)
tree2886e2a08afa81488a4b31cbfd69362b91f915a0
parentde03a1237142e9a86efd069f60b608c31f90d5fa (diff)
downloadmullvadvpn-441c98e3e72bf43020397cd009cfab0754dc4810.tar.xz
mullvadvpn-441c98e3e72bf43020397cd009cfab0754dc4810.zip
Add BridgeEndpoint to TunnelEndpoint in GUI
-rw-r--r--gui/src/main/daemon-rpc.ts7
-rw-r--r--gui/src/shared/daemon-rpc-types.ts9
2 files changed, 16 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({
diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts
index ff1720be06..3225995e75 100644
--- a/gui/src/shared/daemon-rpc-types.ts
+++ b/gui/src/shared/daemon-rpc-types.ts
@@ -35,10 +35,19 @@ export type TunnelType = 'wireguard' | 'openvpn';
export type RelayProtocol = 'tcp' | 'udp';
+export type ProxyType = 'shadowsocks' | 'custom';
+
export interface ITunnelEndpoint {
address: string;
protocol: RelayProtocol;
tunnel: TunnelType;
+ proxy?: IProxyEndpoint;
+}
+
+export interface IProxyEndpoint {
+ address: string;
+ protocol: RelayProtocol;
+ proxy_type: ProxyType;
}
export type DaemonEvent =