diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2019-06-25 18:34:30 +0100 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2019-06-26 14:18:38 +0100 |
| commit | f994f2b111fedc92c14e9644fa4c4759920da828 (patch) | |
| tree | f973e897dfe0dfb7478ef8f5a9aa95a9857891ec /mullvad-cli/src | |
| parent | b5a688fa3b90a78e3ca149dd1edc8adfd1e2751c (diff) | |
| download | mullvadvpn-f994f2b111fedc92c14e9644fa4c4759920da828.tar.xz mullvadvpn-f994f2b111fedc92c14e9644fa4c4759920da828.zip | |
Print keygen result in CLI
Diffstat (limited to 'mullvad-cli/src')
| -rw-r--r-- | mullvad-cli/src/cmds/status.rs | 5 | ||||
| -rw-r--r-- | mullvad-cli/src/cmds/tunnel.rs | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/mullvad-cli/src/cmds/status.rs b/mullvad-cli/src/cmds/status.rs index 8642c581ce..4846296fbb 100644 --- a/mullvad-cli/src/cmds/status.rs +++ b/mullvad-cli/src/cmds/status.rs @@ -57,6 +57,11 @@ impl Command for Status { println!("New relay list: {:#?}", relay_list); } } + DaemonEvent::WireguardKey(key_event) => { + if verbose { + println!("{}", key_event); + } + } } } } diff --git a/mullvad-cli/src/cmds/tunnel.rs b/mullvad-cli/src/cmds/tunnel.rs index 7eacdddb78..9fc7c12469 100644 --- a/mullvad-cli/src/cmds/tunnel.rs +++ b/mullvad-cli/src/cmds/tunnel.rs @@ -173,7 +173,11 @@ impl Tunnel { fn process_wireguard_key_generate() -> Result<()> { let mut rpc = new_rpc_client()?; - rpc.generate_wireguard_key().map_err(|e| e.into()) + let result = rpc + .generate_wireguard_key() + .map_err(|e| crate::Error::RpcClientError(e))?; + println!("{}", result); + Ok(()) } fn handle_ipv6_cmd(matches: &clap::ArgMatches<'_>) -> Result<()> { |