diff options
| author | Joakim Hulthe <joakim.hulthe@mullvad.net> | 2024-08-19 17:15:58 +0200 |
|---|---|---|
| committer | Joakim Hulthe <joakim.hulthe@mullvad.net> | 2024-09-17 11:29:29 +0200 |
| commit | e141580b842834161a362a227b59fc233b6659de (patch) | |
| tree | 7136b1f74af1605bbee403e16e41f276a147db21 /mullvad-cli/src | |
| parent | 31a215bee9954194db9b5b0d90c285fa62d7b6ea (diff) | |
| download | mullvadvpn-e141580b842834161a362a227b59fc233b6659de.tar.xz mullvadvpn-e141580b842834161a362a227b59fc233b6659de.zip | |
Remove daita cfg from mullvad-cli
Diffstat (limited to 'mullvad-cli/src')
| -rw-r--r-- | mullvad-cli/src/cmds/relay.rs | 1 | ||||
| -rw-r--r-- | mullvad-cli/src/cmds/tunnel.rs | 13 |
2 files changed, 2 insertions, 12 deletions
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs index eaaa283411..4fe11b2a8f 100644 --- a/mullvad-cli/src/cmds/relay.rs +++ b/mullvad-cli/src/cmds/relay.rs @@ -542,7 +542,6 @@ impl Relay { allowed_ips: all_of_the_internet(), endpoint: SocketAddr::new(IpAddr::V4(Ipv4Addr::UNSPECIFIED), port), psk: None, - #[cfg(daita)] constant_packet_size: false, }, exit_peer: None, diff --git a/mullvad-cli/src/cmds/tunnel.rs b/mullvad-cli/src/cmds/tunnel.rs index 911c2f010b..c17877b438 100644 --- a/mullvad-cli/src/cmds/tunnel.rs +++ b/mullvad-cli/src/cmds/tunnel.rs @@ -39,11 +39,9 @@ pub enum TunnelOptions { #[arg(long)] quantum_resistant: Option<QuantumResistantState>, /// Configure whether to enable DAITA - #[cfg(daita)] #[arg(long)] daita: Option<BooleanOption>, /// Configure whether to enable DAITA "use anywhere" - #[cfg(daita)] #[arg(long)] daita_use_anywhere: Option<BooleanOption>, /// The key rotation interval. Number of hours, or 'any' @@ -103,7 +101,6 @@ impl Tunnel { tunnel_options.wireguard.quantum_resistant, ); - #[cfg(daita)] print_option!("DAITA", tunnel_options.wireguard.daita.enabled); let key = rpc.get_wireguard_key().await?; @@ -140,9 +137,7 @@ impl Tunnel { TunnelOptions::Wireguard { mtu, quantum_resistant, - #[cfg(daita)] daita, - #[cfg(daita)] daita_use_anywhere, rotation_interval, rotate_key, @@ -150,9 +145,7 @@ impl Tunnel { Self::handle_wireguard( mtu, quantum_resistant, - #[cfg(daita)] daita, - #[cfg(daita)] daita_use_anywhere, rotation_interval, rotate_key, @@ -184,8 +177,8 @@ impl Tunnel { async fn handle_wireguard( mtu: Option<Constraint<u16>>, quantum_resistant: Option<QuantumResistantState>, - #[cfg(daita)] daita: Option<BooleanOption>, - #[cfg(daita)] daita_use_anywhere: Option<BooleanOption>, + daita: Option<BooleanOption>, + daita_use_anywhere: Option<BooleanOption>, rotation_interval: Option<Constraint<RotationInterval>>, rotate_key: Option<RotateKey>, ) -> Result<()> { @@ -201,13 +194,11 @@ impl Tunnel { println!("Quantum resistant setting has been updated"); } - #[cfg(daita)] if let Some(enable_daita) = daita { rpc.set_enable_daita(*enable_daita).await?; println!("DAITA setting has been updated"); } - #[cfg(daita)] if let Some(daita_use_anywhere) = daita_use_anywhere { rpc.set_daita_use_anywhere(*daita_use_anywhere).await?; println!("DAITA setting has been updated"); |