diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2019-01-14 13:29:16 +0000 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2019-01-30 13:41:31 +0000 |
| commit | 7a99bd987ee258ee54a8cb28ab4f580ac03ffe86 (patch) | |
| tree | 0d7fa957b2b321c89a33bbb2382f16e5068e4333 /mullvad-ipc-client/src/lib.rs | |
| parent | 4e2b2ff81704fdab21b269948c3ebf2a9f65b07c (diff) | |
| download | mullvadvpn-7a99bd987ee258ee54a8cb28ab4f580ac03ffe86.tar.xz mullvadvpn-7a99bd987ee258ee54a8cb28ab4f580ac03ffe86.zip | |
Refactor mullvad types
Diffstat (limited to 'mullvad-ipc-client/src/lib.rs')
| -rw-r--r-- | mullvad-ipc-client/src/lib.rs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/mullvad-ipc-client/src/lib.rs b/mullvad-ipc-client/src/lib.rs index 99f9ff6815..d7eaf653ef 100644 --- a/mullvad-ipc-client/src/lib.rs +++ b/mullvad-ipc-client/src/lib.rs @@ -12,15 +12,12 @@ use mullvad_types::{ location::GeoIpLocation, relay_constraints::{RelaySettings, RelaySettingsUpdate}, relay_list::RelayList, - settings::Settings, + settings::{Settings, TunnelOptions}, version::AppVersionInfo, }; use serde::{Deserialize, Serialize}; use std::{path::Path, sync::mpsc, thread, time::Duration}; -use talpid_types::{ - net::{OpenVpnProxySettings, TunnelOptions}, - tunnel::TunnelStateTransition, -}; +use talpid_types::{net::openvpn, tunnel::TunnelStateTransition}; pub use jsonrpc_client_core::{Error as RpcError, ErrorKind as RpcErrorKind}; @@ -196,7 +193,7 @@ impl DaemonRpcClient { self.call("set_openvpn_mssfix", &[mssfix]) } - pub fn set_openvpn_proxy(&mut self, proxy: Option<OpenVpnProxySettings>) -> Result<()> { + pub fn set_openvpn_proxy(&mut self, proxy: Option<openvpn::ProxySettings>) -> Result<()> { self.call("set_openvpn_proxy", &[proxy]) } |
