diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-05-23 13:07:18 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-05-23 13:07:18 +0200 |
| commit | 54754e78fa41244f661bf76d921b35edeb6b9be8 (patch) | |
| tree | dc1e0156f6019a2b7f2d37cc7325ac3794b1bef1 /mullvad_daemon/src | |
| parent | 649a0d5bae81ac6b1b1385fd9ad013f4c3134515 (diff) | |
| parent | 26d77b11f01276023683ac0701ef2e190b367dc6 (diff) | |
| download | mullvadvpn-54754e78fa41244f661bf76d921b35edeb6b9be8.tar.xz mullvadvpn-54754e78fa41244f661bf76d921b35edeb6b9be8.zip | |
Merge branch 'new-openvpn-monitor'
Diffstat (limited to 'mullvad_daemon/src')
| -rw-r--r-- | mullvad_daemon/src/mock_ipc.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mullvad_daemon/src/mock_ipc.rs b/mullvad_daemon/src/mock_ipc.rs index dd76f8f8c0..90859401c2 100644 --- a/mullvad_daemon/src/mock_ipc.rs +++ b/mullvad_daemon/src/mock_ipc.rs @@ -31,7 +31,7 @@ impl IpcServer { } pub fn address(&self) -> &str { - &self.server.address() + self.server.address() } pub fn wait(self) -> talpid_ipc::Result<()> { @@ -81,7 +81,7 @@ fn meta_extractor(context: &jsonrpc_ws_server::RequestContext) -> Meta { /// A mock implementation of the Mullvad frontend API. A very simplified explanation is that for /// the real implementation `tunnel_is_up` should be replaced with some kind of handle (or proxy to -/// a handle) to the jsonrpc client talking with talpid_core. +/// a handle) to the jsonrpc client talking with `talpid_core`. pub struct MockIpcApi { next_subscription_id: atomic::AtomicUsize, active: ActiveSubscriptions, |