diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-10-26 20:56:36 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-12-04 13:18:17 +0000 |
| commit | cc0bc7e4abc129319f108a029cfc46b7768557e3 (patch) | |
| tree | bbd3112f87c37bc2d0855e651b6d6973453583be | |
| parent | e2a5f71217b2d14f236ab0a0abd69547eaad30aa (diff) | |
| download | mullvadvpn-cc0bc7e4abc129319f108a029cfc46b7768557e3.tar.xz mullvadvpn-cc0bc7e4abc129319f108a029cfc46b7768557e3.zip | |
Include `DnsOptions` in `TunnelOptions` class
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelOptions.kt | 2 | ||||
| -rw-r--r-- | mullvad-types/src/settings/mod.rs | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelOptions.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelOptions.kt index 7579a469ca..7e3bdef2b3 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelOptions.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/TunnelOptions.kt @@ -2,4 +2,4 @@ package net.mullvad.mullvadvpn.model import net.mullvad.talpid.net.wireguard.TunnelOptions as WireguardTunnelOptions -data class TunnelOptions(val wireguard: WireguardTunnelOptions) +data class TunnelOptions(val wireguard: WireguardTunnelOptions, val dnsOptions: DnsOptions) diff --git a/mullvad-types/src/settings/mod.rs b/mullvad-types/src/settings/mod.rs index e16332159a..ac28853d15 100644 --- a/mullvad-types/src/settings/mod.rs +++ b/mullvad-types/src/settings/mod.rs @@ -166,7 +166,6 @@ pub struct TunnelOptions { #[cfg_attr(target_os = "android", jnix(skip))] pub generic: GenericTunnelOptions, /// Custom DNS options. - #[cfg(not(target_os = "android"))] pub dns_options: DnsOptions, } |