diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2018-08-28 16:45:07 +0100 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2018-08-29 16:28:17 +0100 |
| commit | 0dd43272e4473dbd01ef39ab8bfbb454c47487da (patch) | |
| tree | b72f5e2171a425199677820de8c031d7eabc5c9b /mullvad-cli/src/main.rs | |
| parent | c3104f8a5ec79827c56e71732e867d836428357b (diff) | |
| download | mullvadvpn-0dd43272e4473dbd01ef39ab8bfbb454c47487da.tar.xz mullvadvpn-0dd43272e4473dbd01ef39ab8bfbb454c47487da.zip | |
Change mullvad-cli to use new jsonrpc client
Diffstat (limited to 'mullvad-cli/src/main.rs')
| -rw-r--r-- | mullvad-cli/src/main.rs | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/mullvad-cli/src/main.rs b/mullvad-cli/src/main.rs index 2c551c5622..0cf9e9307a 100644 --- a/mullvad-cli/src/main.rs +++ b/mullvad-cli/src/main.rs @@ -9,9 +9,11 @@ #[macro_use] extern crate clap; extern crate env_logger; +extern crate futures; #[macro_use] extern crate error_chain; extern crate mullvad_ipc_client; +extern crate mullvad_paths; extern crate mullvad_types; extern crate serde; extern crate talpid_types; @@ -19,6 +21,7 @@ extern crate talpid_types; mod cmds; +use mullvad_ipc_client::{new_standalone_ipc_client, DaemonRpcClient}; use std::io; error_chain! { @@ -28,10 +31,14 @@ error_chain! { } links { - RpcError(mullvad_ipc_client::Error, mullvad_ipc_client::ErrorKind); + RpcClientError(mullvad_ipc_client::Error, mullvad_ipc_client::ErrorKind); } } +pub fn new_rpc_client() -> Result<DaemonRpcClient> { + new_standalone_ipc_client(&mullvad_paths::get_rpc_socket_path()).map_err(|e| Error::from(e)) +} + quick_main!(run); fn run() -> Result<()> { |