summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2021-11-15 18:21:02 +0100
committerDavid Lönnhager <david.l@mullvad.net>2021-12-08 13:01:44 +0100
commit264dd08adb89e0cfbcbb0891545f3c8e64a9e4d0 (patch)
tree62a5b4e1b435fd2640b508f9cfce8ed716a218ca
parent5912ff99fc145f399a8a98730179ce01993acf05 (diff)
downloadmullvadvpn-264dd08adb89e0cfbcbb0891545f3c8e64a9e4d0.tar.xz
mullvadvpn-264dd08adb89e0cfbcbb0891545f3c8e64a9e4d0.zip
Use wireguard-nt by default
-rw-r--r--talpid-types/src/net/wireguard.rs20
1 files changed, 18 insertions, 2 deletions
diff --git a/talpid-types/src/net/wireguard.rs b/talpid-types/src/net/wireguard.rs
index 4ceb551bcb..fb808ced47 100644
--- a/talpid-types/src/net/wireguard.rs
+++ b/talpid-types/src/net/wireguard.rs
@@ -72,7 +72,7 @@ pub struct TunnelConfig {
}
/// Options in [`TunnelParameters`] that apply to any WireGuard connection.
-#[derive(Debug, Default, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[cfg_attr(target_os = "android", derive(IntoJava))]
#[cfg_attr(
target_os = "android",
@@ -87,10 +87,26 @@ pub struct TunnelOptions {
pub mtu: Option<u16>,
/// Temporary switch for wireguard-nt
#[cfg(windows)]
- #[serde(default)]
+ #[serde(default = "default_wgnt_setting")]
+ #[serde(rename = "wireguard_nt")]
pub use_wireguard_nt: bool,
}
+#[cfg(windows)]
+fn default_wgnt_setting() -> bool {
+ true
+}
+
+impl Default for TunnelOptions {
+ fn default() -> Self {
+ Self {
+ mtu: None,
+ #[cfg(windows)]
+ use_wireguard_nt: default_wgnt_setting(),
+ }
+ }
+}
+
/// Wireguard x25519 private key
#[derive(Clone)]
pub struct PrivateKey(x25519_dalek::StaticSecret);