summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-05-30 17:27:39 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-06-11 13:36:09 +0000
commite6657ccf9081148dce6be332ac9acc7981239d7b (patch)
treef66536c38bdb9efcdb9d3402ee052b8ec009553e
parent14d227892a2e5de8045ec185188a69ad7ada8813 (diff)
downloadmullvadvpn-e6657ccf9081148dce6be332ac9acc7981239d7b.tar.xz
mullvadvpn-e6657ccf9081148dce6be332ac9acc7981239d7b.zip
Implement `DaemonInterface::get_state`
-rw-r--r--mullvad-jni/src/daemon_interface.rs10
1 files changed, 9 insertions, 1 deletions
diff --git a/mullvad-jni/src/daemon_interface.rs b/mullvad-jni/src/daemon_interface.rs
index bb92ea9cc8..fb398c5461 100644
--- a/mullvad-jni/src/daemon_interface.rs
+++ b/mullvad-jni/src/daemon_interface.rs
@@ -4,7 +4,7 @@ use mullvad_types::{
account::AccountData, relay_constraints::RelaySettingsUpdate, relay_list::RelayList,
settings::Settings, states::TargetState,
};
-use talpid_types::net::wireguard;
+use talpid_types::{net::wireguard, tunnel::TunnelStateTransition};
#[derive(Debug, err_derive::Error)]
pub enum Error {
@@ -98,6 +98,14 @@ impl DaemonInterface {
Ok(rx.wait().map_err(|_| Error::NoResponse)?)
}
+ pub fn get_state(&self) -> Result<TunnelStateTransition> {
+ let (tx, rx) = oneshot::channel();
+
+ self.send_command(ManagementCommand::GetState(tx))?;
+
+ Ok(rx.wait().map_err(|_| Error::NoResponse)?)
+ }
+
pub fn get_wireguard_key(&self) -> Result<Option<wireguard::PublicKey>> {
let (tx, rx) = oneshot::channel();