diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-05-22 14:29:05 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-05-22 21:18:39 +0000 |
| commit | 10ec0f26b57a28769a6e8f7f0d9542173d3e565a (patch) | |
| tree | 706c498c4b50ccaba31c652112a01c22c9939aeb | |
| parent | 0f30db4f56f65cb9b18fa0661f2a871bc316228c (diff) | |
| download | mullvadvpn-10ec0f26b57a28769a6e8f7f0d9542173d3e565a.tar.xz mullvadvpn-10ec0f26b57a28769a6e8f7f0d9542173d3e565a.zip | |
Implement `DaemonInterface::get_relay_locations`
| -rw-r--r-- | mullvad-jni/src/daemon_interface.rs | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mullvad-jni/src/daemon_interface.rs b/mullvad-jni/src/daemon_interface.rs index 21dabea9aa..e0ffa13c84 100644 --- a/mullvad-jni/src/daemon_interface.rs +++ b/mullvad-jni/src/daemon_interface.rs @@ -1,6 +1,6 @@ use futures::{sync::oneshot, Future}; use mullvad_daemon::{DaemonCommandSender, ManagementCommand}; -use mullvad_types::{account::AccountData, settings::Settings}; +use mullvad_types::{account::AccountData, relay_list::RelayList, settings::Settings}; #[derive(Debug, err_derive::Error)] pub enum Error { @@ -45,6 +45,14 @@ impl DaemonInterface { .map_err(Error::RpcError) } + pub fn get_relay_locations(&self) -> Result<RelayList> { + let (tx, rx) = oneshot::channel(); + + self.send_command(ManagementCommand::GetRelayLocations(tx))?; + + Ok(rx.wait().map_err(|_| Error::NoResponse)?) + } + pub fn get_settings(&self) -> Result<Settings> { let (tx, rx) = oneshot::channel(); |
