Pass disableIPv6 setting to libsignal-net

signalapp · Apr 23, 2024 · ae4fa04 · ae4fa04
1 parent 7933460
commit ae4fa04
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/ts/textsecure/SocketManager.ts b/ts/textsecure/SocketManager.ts
@@ -559,8 +559,6 @@ export class SocketManager extends EventListener {
         : TransportOption.ShadowingLow;
     }
 
-    // in prod, switch to using 'ShadowingHigh' mode, unless user opts out,
-    // in which case switching to `ShadowingLow`
     const configValue = window.Signal.RemoteConfig.isEnabled(
       'desktop.experimentalTransportEnabled.prod'
     );

diff --git a/ts/textsecure/WebAPI.ts b/ts/textsecure/WebAPI.ts
@@ -640,6 +640,7 @@ type InitializeOptionsType = {
   version: string;
   directoryConfig: DirectoryConfigType;
   libsignalNetEnvironment: string | undefined;
+  disableIPv6: boolean;
 };
 
 export type MessageType = Readonly<{
@@ -1459,6 +1460,7 @@ export function initialize({
   proxyUrl,
   version,
   libsignalNetEnvironment,
+  disableIPv6,
 }: InitializeOptionsType): WebAPIConnectType {
   if (!isString(url)) {
     throw new Error('WebAPI.initialize: Invalid server url');
@@ -1510,6 +1512,7 @@ export function initialize({
   );
   log.info(`libsignal net environment resolved to [${Net.Environment[env]}]`);
   const libsignalNet = new Net.Net(env);
+  libsignalNet.setIpv6Enabled(!disableIPv6);
 
   // Thanks to function-hoisting, we can put this return statement before all of the
   //   below function definitions.

diff --git a/ts/windows/main/phase2-dependencies.ts b/ts/windows/main/phase2-dependencies.ts
@@ -39,6 +39,7 @@ window.WebAPI = window.textsecure.WebAPI.initialize({
   proxyUrl: config.proxyUrl,
   version: config.version,
   libsignalNetEnvironment: config.libsignalNetEnvironment,
+  disableIPv6: config.disableIPv6,
 });
 
 window.libphonenumberInstance = PhoneNumberUtil.getInstance();