diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-04-24 06:48:55 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-05-03 14:51:17 -0300 |
| commit | f22188ebf605de011de36aa800bc669123667d10 (patch) | |
| tree | fcb71df5aff15271910d23d194979770c344a546 | |
| parent | d51d5806cee4605e21bdecd2c2442ab279a93a1b (diff) | |
| download | mullvadvpn-f22188ebf605de011de36aa800bc669123667d10.tar.xz mullvadvpn-f22188ebf605de011de36aa800bc669123667d10.zip | |
Use `DaemonRpcClient` in `status` CLI command
| -rw-r--r-- | mullvad-cli/src/cmds/status.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mullvad-cli/src/cmds/status.rs b/mullvad-cli/src/cmds/status.rs index 175e6638b0..a869fd5eb6 100644 --- a/mullvad-cli/src/cmds/status.rs +++ b/mullvad-cli/src/cmds/status.rs @@ -2,9 +2,8 @@ use clap; use Command; use Result; -use mullvad_types::location::GeoIpLocation; -use mullvad_types::states::{DaemonState, SecurityState, TargetState}; -use rpc; +use mullvad_ipc_client::DaemonRpcClient; +use mullvad_types::states::{SecurityState, TargetState}; pub struct Status; @@ -18,7 +17,8 @@ impl Command for Status { } fn run(&self, _matches: &clap::ArgMatches) -> Result<()> { - let state: DaemonState = rpc::call("get_state", &[] as &[u8; 0])?; + let rpc = DaemonRpcClient::new()?; + let state = rpc.get_state()?; print!("Tunnel status: "); match (state.state, state.target_state) { (SecurityState::Unsecured, TargetState::Unsecured) => println!("Disconnected"), @@ -27,7 +27,7 @@ impl Command for Status { (SecurityState::Secured, TargetState::Secured) => println!("Connected"), } - let location: GeoIpLocation = rpc::call("get_current_location", &[] as &[u8; 0])?; + let location = rpc.get_current_location()?; let city_and_country = if let Some(city) = location.city { format!("{}, {}", city, location.country) } else { |
