diff options
| author | David Lönnhager <david.l@mullvad.net> | 2021-11-01 15:36:06 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2022-03-14 12:08:39 +0100 |
| commit | 35e6fbe52cdb0cfeceb951ce35d51fe5994858aa (patch) | |
| tree | abfe9f14cb5ec15b4d6314e98e22b5478c07e6db /mullvad-cli/src | |
| parent | 30ddf7bcc2349c2d04b22a47af850422abfb778b (diff) | |
| download | mullvadvpn-35e6fbe52cdb0cfeceb951ce35d51fe5994858aa.tar.xz mullvadvpn-35e6fbe52cdb0cfeceb951ce35d51fe5994858aa.zip | |
Remove keygen event remnants
Diffstat (limited to 'mullvad-cli/src')
| -rw-r--r-- | mullvad-cli/src/cmds/status.rs | 2 | ||||
| -rw-r--r-- | mullvad-cli/src/cmds/tunnel.rs | 4 | ||||
| -rw-r--r-- | mullvad-cli/src/format.rs | 21 |
3 files changed, 4 insertions, 23 deletions
diff --git a/mullvad-cli/src/cmds/status.rs b/mullvad-cli/src/cmds/status.rs index f5a681e36c..0a11aca475 100644 --- a/mullvad-cli/src/cmds/status.rs +++ b/mullvad-cli/src/cmds/status.rs @@ -1,4 +1,4 @@ -use crate::{format, format::print_keygen_event, new_rpc_client, Command, Error, Result}; +use crate::{format, new_rpc_client, Command, Error, Result}; use mullvad_management_interface::{ types::daemon_event::Event as EventType, ManagementServiceClient, }; diff --git a/mullvad-cli/src/cmds/tunnel.rs b/mullvad-cli/src/cmds/tunnel.rs index f27e29d147..f01452a925 100644 --- a/mullvad-cli/src/cmds/tunnel.rs +++ b/mullvad-cli/src/cmds/tunnel.rs @@ -1,4 +1,4 @@ -use crate::{format::print_keygen_event, new_rpc_client, Command, Error, Result}; +use crate::{new_rpc_client, Command, Error, Result}; use mullvad_management_interface::types::{self, Timestamp, TunnelOptions}; use mullvad_types::wireguard::DEFAULT_ROTATION_INTERVAL; use std::{convert::TryFrom, time::Duration}; @@ -251,7 +251,7 @@ impl Tunnel { async fn process_wireguard_key_generate() -> Result<()> { let mut rpc = new_rpc_client().await?; - let keygen_event = rpc.rotate_wireguard_key(()).await?; + rpc.rotate_wireguard_key(()).await?; println!("Rotated WireGuard key"); Ok(()) } diff --git a/mullvad-cli/src/format.rs b/mullvad-cli/src/format.rs index b056ffff53..eb91ffcca8 100644 --- a/mullvad-cli/src/format.rs +++ b/mullvad-cli/src/format.rs @@ -5,30 +5,11 @@ use mullvad_management_interface::types::{ }, tunnel_state, tunnel_state::State::*, - ErrorState, KeygenEvent, ProxyType, TransportProtocol, TunnelEndpoint, TunnelState, TunnelType, + ErrorState, ProxyType, TransportProtocol, TunnelEndpoint, TunnelState, TunnelType, }; use mullvad_types::auth_failed::AuthFailed; use std::fmt::Write; -pub fn print_keygen_event(key_event: &KeygenEvent) { - use mullvad_management_interface::types::keygen_event::KeygenEvent as EventType; - - match EventType::from_i32(key_event.event).unwrap() { - EventType::NewKey => { - println!( - "New WireGuard key: {}", - base64::encode(&key_event.new_key.as_ref().unwrap().key) - ); - } - EventType::TooManyKeys => { - println!("Account has too many keys already"); - } - EventType::GenerationFailure => { - println!("Failed to generate new WireGuard key"); - } - } -} - pub fn print_state(state: &TunnelState) { print!("Tunnel status: "); match state.state.as_ref().unwrap() { |
