Merge branch 'move-enable-ipv6-to-tunnel-options'

2 files changed, 8 insertions, 12 deletions

diff --git a/gui/packages/desktop/src/renderer/app.js b/gui/packages/desktop/src/renderer/app.js
index d62745ee97..a1427605e3 100644
--- a/gui/packages/desktop/src/renderer/app.js
+++ b/gui/packages/desktop/src/renderer/app.js
@@ -380,7 +380,7 @@ export default class AppRenderer {
 
   async setEnableIpv6(enableIpv6: boolean) {
     const actions = this._reduxActions;
-    await this._daemonRpc.setOpenVpnEnableIpv6(enableIpv6);
+    await this._daemonRpc.setEnableIpv6(enableIpv6);
     actions.settings.updateEnableIpv6(enableIpv6);
   }
 
@@ -410,7 +410,7 @@ export default class AppRenderer {
   async _fetchTunnelOptions() {
     const actions = this._reduxActions;
     const tunnelOptions = await this._daemonRpc.getTunnelOptions();
-    actions.settings.updateEnableIpv6(tunnelOptions.openvpn.enableIpv6);
+    actions.settings.updateEnableIpv6(tunnelOptions.enableIpv6);
   }
 
   async _fetchVersionInfo() {
diff --git a/gui/packages/desktop/src/renderer/lib/daemon-rpc.js b/gui/packages/desktop/src/renderer/lib/daemon-rpc.js
index 0408017d5a..e87f51930b 100644
--- a/gui/packages/desktop/src/renderer/lib/daemon-rpc.js
+++ b/gui/packages/desktop/src/renderer/lib/daemon-rpc.js
@@ -206,14 +206,12 @@ const RelayListSchema = object({
 });
 
 export type TunnelOptions = {
-  openvpn: {
-    enableIpv6: boolean,
-  },
+  enableIpv6: boolean,
 };
 
 const TunnelOptionsSchema = object({
+  enable_ipv6: boolean,
   openvpn: object({
-    enable_ipv6: boolean,
     mssfix: maybe(number),
   }),
 });
@@ -272,7 +270,7 @@ export interface DaemonRpcProtocol {
   getRelaySettings(): Promise<RelaySettings>;
   setAllowLan(boolean): Promise<void>;
   getAllowLan(): Promise<boolean>;
-  setOpenVpnEnableIpv6(boolean): Promise<void>;
+  setEnableIpv6(boolean): Promise<void>;
   getTunnelOptions(): Promise<TunnelOptions>;
   setAutoConnect(boolean): Promise<void>;
   getAutoConnect(): Promise<boolean>;
@@ -429,8 +427,8 @@ export class DaemonRpc implements DaemonRpcProtocol {
     }
   }
 
-  async setOpenVpnEnableIpv6(enableIpv6: boolean): Promise<void> {
-    await this._transport.send('set_openvpn_enable_ipv6', [enableIpv6]);
+  async setEnableIpv6(enableIpv6: boolean): Promise<void> {
+    await this._transport.send('set_enable_ipv6', [enableIpv6]);
   }
 
   async getTunnelOptions(): Promise<TunnelOptions> {
@@ -439,9 +437,7 @@ export class DaemonRpc implements DaemonRpcProtocol {
       const validatedObject = validate(TunnelOptionsSchema, response);
 
       return {
-        openvpn: {
-          enableIpv6: validatedObject.openvpn.enable_ipv6,
-        },
+        enableIpv6: validatedObject.enable_ipv6,
       };
     } catch (error) {
       throw new ResponseParseError('Invalid response from get_tunnel_options', error);