diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-03-27 15:15:42 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-03-27 15:45:22 +0100 |
| commit | aefbb16235edb96fa38745d1ded72a23ccddafd3 (patch) | |
| tree | b54cb4a388dc525b4812fbe89f06335b594b35d1 /mullvad-ipc-client/src | |
| parent | d334f116441186ee57abab70dc0509d8e69b860f (diff) | |
| download | mullvadvpn-aefbb16235edb96fa38745d1ded72a23ccddafd3.tar.xz mullvadvpn-aefbb16235edb96fa38745d1ded72a23ccddafd3.zip | |
Change daemon to expose a single event subscription
Diffstat (limited to 'mullvad-ipc-client/src')
| -rw-r--r-- | mullvad-ipc-client/src/lib.rs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/mullvad-ipc-client/src/lib.rs b/mullvad-ipc-client/src/lib.rs index 21503d0155..df07c9123f 100644 --- a/mullvad-ipc-client/src/lib.rs +++ b/mullvad-ipc-client/src/lib.rs @@ -11,6 +11,7 @@ use mullvad_types::{ relay_list::RelayList, settings::{Settings, TunnelOptions}, version::AppVersionInfo, + DaemonEvent, }; use serde::{Deserialize, Serialize}; use std::{path::Path, thread}; @@ -248,16 +249,16 @@ impl DaemonRpcClient { .chain_err(|| ErrorKind::RpcCallError(method.to_owned())) } - pub fn new_state_subscribe( + pub fn daemon_event_subscribe( &mut self, ) -> impl Future< - Item = jsonrpc_client_pubsub::Subscription<TunnelStateTransition>, + Item = jsonrpc_client_pubsub::Subscription<DaemonEvent>, Error = jsonrpc_client_pubsub::Error, > { self.subscriber.subscribe( - "new_state_subscribe".to_string(), - "new_state_unsubscribe".to_string(), - "new_state".to_string(), + "daemon_event_subscribe".to_string(), + "daemon_event_unsubscribe".to_string(), + "daemon_event".to_string(), 0, &NO_ARGS, ) |
