diff options
| author | David Lönnhager <david.l@mullvad.net> | 2021-05-12 11:10:43 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2021-05-12 16:21:53 +0200 |
| commit | 3fd335bec438404cc63734ec8ab5fb6a708ed52b (patch) | |
| tree | d1dd7ed60561ff41ffd04a8d667b6631d7b198fa | |
| parent | 3cfd917f59494ebd7f9dcb7314b63c8fa5b5b7aa (diff) | |
| download | mullvadvpn-3fd335bec438404cc63734ec8ab5fb6a708ed52b.tar.xz mullvadvpn-3fd335bec438404cc63734ec8ab5fb6a708ed52b.zip | |
Update GUI DNS options
| -rw-r--r-- | gui/src/main/daemon-rpc.ts | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts index 21c320cc77..5e28be9380 100644 --- a/gui/src/main/daemon-rpc.ts +++ b/gui/src/main/daemon-rpc.ts @@ -447,15 +447,20 @@ export class DaemonRpc { public async setDnsOptions(dns: IDnsOptions): Promise<void> { const dnsOptions = new grpcTypes.DnsOptions(); + + const defaultOptions = new grpcTypes.DefaultDnsOptions(); + defaultOptions.setBlockAds(false); + defaultOptions.setBlockTrackers(false); + dnsOptions.setDefaultOptions(defaultOptions); + + const customOptions = new grpcTypes.CustomDnsOptions(); + customOptions.setAddressesList(dns.addresses); + dnsOptions.setCustomOptions(customOptions); + if (dns.custom) { - const customOptions = new grpcTypes.CustomDnsOptions(); - customOptions.setAddressesList(dns.addresses); - dnsOptions.setCustom(customOptions); + dnsOptions.setState(grpcTypes.DnsOptions.DnsState.CUSTOM); } else { - const defaultOptions = new grpcTypes.DefaultDnsOptions(); - defaultOptions.setBlockAds(false); - defaultOptions.setBlockTrackers(false); - dnsOptions.setDefault(defaultOptions); + dnsOptions.setState(grpcTypes.DnsOptions.DnsState.DEFAULT); } await this.call<grpcTypes.DnsOptions, Empty>(this.client.setDnsOptions, dnsOptions); @@ -1037,8 +1042,8 @@ function convertFromTunnelOptions(tunnelOptions: grpcTypes.TunnelOptions.AsObjec enableIpv6: tunnelOptions.generic!.enableIpv6, }, dns: { - custom: !!tunnelOptions.dnsOptions?.custom, - addresses: tunnelOptions.dnsOptions?.custom?.addressesList ?? [], + custom: tunnelOptions.dnsOptions!.state! === grpcTypes.DnsOptions.DnsState.CUSTOM, + addresses: tunnelOptions.dnsOptions?.customOptions?.addressesList ?? [], }, }; } |