mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Pass disableIPv6 setting to libsignal-net

Browse source 
Co-authored-by: Sergey Skrobotov <sergey@signal.org>
This commit is contained in:
automated-signal 2024-04-23 19:15:54 -05:00 committed by Fedor Indutny
parent fa3f8b08ab
commit 90c9b0ecaa
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ts/textsecure/SocketManager.ts
View file

@ -559,8 +559,6 @@ export class SocketManager extends EventListener {
: TransportOption.ShadowingLow; : 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( const configValue = window.Signal.RemoteConfig.isEnabled(
'desktop.experimentalTransportEnabled.prod' 'desktop.experimentalTransportEnabled.prod'
); );

3
ts/textsecure/WebAPI.ts
View file

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

1
ts/windows/main/phase2-dependencies.ts
View file

@ -39,6 +39,7 @@ window.WebAPI = window.textsecure.WebAPI.initialize({
proxyUrl: config.proxyUrl, proxyUrl: config.proxyUrl,
version: config.version, version: config.version,
libsignalNetEnvironment: config.libsignalNetEnvironment, libsignalNetEnvironment: config.libsignalNetEnvironment,
disableIPv6: config.disableIPv6,
}); });
window.libphonenumberInstance = PhoneNumberUtil.getInstance(); window.libphonenumberInstance = PhoneNumberUtil.getInstance();