Merge branch 'obfuscation-gui'

2 files changed, 20 insertions, 2 deletions

diff --git a/gui/src/shared/daemon-rpc-types.ts b/gui/src/shared/daemon-rpc-types.ts
index d0507cab98..5893e4def6 100644
--- a/gui/src/shared/daemon-rpc-types.ts
+++ b/gui/src/shared/daemon-rpc-types.ts
@@ -61,7 +61,7 @@ export function tunnelTypeToString(tunnel: TunnelType): string {
 }
 
 export type RelayProtocol = 'tcp' | 'udp';
-export type ObfuscationType = 'udp2tcp';
+export type EndpointObfuscationType = 'udp2tcp';
 
 export type Constraint<T> = 'any' | { only: T };
 export type LiftedConstraint<T> = 'any' | T;
@@ -107,7 +107,7 @@ export interface IObfuscationEndpoint {
   address: string;
   port: number;
   protocol: RelayProtocol;
-  obfuscationType: ObfuscationType;
+  obfuscationType: EndpointObfuscationType;
 }
 
 export interface IProxyEndpoint {
@@ -347,6 +347,7 @@ export interface ISettings {
   bridgeSettings: BridgeSettings;
   bridgeState: BridgeState;
   splitTunnel: SplitTunnelSettings;
+  obfuscationSettings: ObfuscationSettings;
 }
 
 export type BridgeState = 'auto' | 'on' | 'off';
@@ -356,6 +357,21 @@ export type SplitTunnelSettings = {
   appsList: string[];
 };
 
+export type Udp2TcpObfuscationSettings = {
+  port: Constraint<number>;
+};
+
+export enum ObfuscationType {
+  auto,
+  off,
+  udp2tcp,
+}
+
+export type ObfuscationSettings = {
+  selectedObfuscation: ObfuscationType;
+  udp2tcpSettings: Udp2TcpObfuscationSettings;
+};
+
 export interface IBridgeConstraints {
   location: Constraint<RelayLocation>;
   providers: string[];
diff --git a/gui/src/shared/ipc-schema.ts b/gui/src/shared/ipc-schema.ts
index 8dece5168d..33ac82180e 100644
--- a/gui/src/shared/ipc-schema.ts
+++ b/gui/src/shared/ipc-schema.ts
@@ -15,6 +15,7 @@ import {
   ILocation,
   IRelayList,
   ISettings,
+  ObfuscationSettings,
   RelaySettingsUpdate,
   TunnelState,
   VoucherResponse,
@@ -170,6 +171,7 @@ export const ipcSchema = {
     updateRelaySettings: invoke<RelaySettingsUpdate, void>(),
     updateBridgeSettings: invoke<BridgeSettings, void>(),
     setDnsOptions: invoke<IDnsOptions, void>(),
+    setObfuscationSettings: invoke<ObfuscationSettings, void>(),
   },
   guiSettings: {
     '': notifyRenderer<IGuiSettingsState>(),