diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-09-09 15:42:46 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-09-10 11:49:35 +0000 |
| commit | 22d9ed9588ac1cf49d429fba6906a659f2e5e721 (patch) | |
| tree | 9a7910cd44d58573de3c9ac21bbbb75f8e3aba05 | |
| parent | 235506bc6ec9b453716b2f85e4abdb57dd54380d (diff) | |
| download | mullvadvpn-22d9ed9588ac1cf49d429fba6906a659f2e5e721.tar.xz mullvadvpn-22d9ed9588ac1cf49d429fba6906a659f2e5e721.zip | |
Pass a mutable reference to `dyn TunProvider`
| -rw-r--r-- | talpid-core/src/tunnel/mod.rs | 4 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/wireguard/mod.rs | 2 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/wireguard/wireguard_go.rs | 2 | ||||
| -rw-r--r-- | talpid-core/src/tunnel_state_machine/connecting_state.rs | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/talpid-core/src/tunnel/mod.rs b/talpid-core/src/tunnel/mod.rs index 9014ee16ab..8fe2f7eb66 100644 --- a/talpid-core/src/tunnel/mod.rs +++ b/talpid-core/src/tunnel/mod.rs @@ -145,7 +145,7 @@ impl TunnelMonitor { log_dir: &Option<PathBuf>, resource_dir: &Path, on_event: L, - tun_provider: &dyn TunProvider, + tun_provider: &mut dyn TunProvider, ) -> Result<Self> where L: Fn(TunnelEvent) + Send + Clone + Sync + 'static, @@ -175,7 +175,7 @@ impl TunnelMonitor { params: &wireguard_types::TunnelParameters, log: Option<PathBuf>, on_event: L, - tun_provider: &dyn TunProvider, + tun_provider: &mut dyn TunProvider, ) -> Result<Self> where L: Fn(TunnelEvent) + Send + Sync + Clone + 'static, diff --git a/talpid-core/src/tunnel/wireguard/mod.rs b/talpid-core/src/tunnel/wireguard/mod.rs index 440bd1ae61..71ef1a83b3 100644 --- a/talpid-core/src/tunnel/wireguard/mod.rs +++ b/talpid-core/src/tunnel/wireguard/mod.rs @@ -82,7 +82,7 @@ impl WireguardMonitor { config: &Config, log_path: Option<&Path>, on_event: F, - tun_provider: &dyn TunProvider, + tun_provider: &mut dyn TunProvider, ) -> Result<WireguardMonitor> { let tunnel = Box::new(WgGoTunnel::start_tunnel( &config, diff --git a/talpid-core/src/tunnel/wireguard/wireguard_go.rs b/talpid-core/src/tunnel/wireguard/wireguard_go.rs index 38a0c83218..ba0e49f373 100644 --- a/talpid-core/src/tunnel/wireguard/wireguard_go.rs +++ b/talpid-core/src/tunnel/wireguard/wireguard_go.rs @@ -18,7 +18,7 @@ impl WgGoTunnel { pub fn start_tunnel( config: &Config, log_path: Option<&Path>, - tun_provider: &dyn TunProvider, + tun_provider: &mut dyn TunProvider, routes: impl Iterator<Item = IpNetwork>, ) -> Result<Self> { #[cfg_attr(not(target_os = "android"), allow(unused_mut))] diff --git a/talpid-core/src/tunnel_state_machine/connecting_state.rs b/talpid-core/src/tunnel_state_machine/connecting_state.rs index 2c8b112537..74494241db 100644 --- a/talpid-core/src/tunnel_state_machine/connecting_state.rs +++ b/talpid-core/src/tunnel_state_machine/connecting_state.rs @@ -15,7 +15,7 @@ use futures::{ }; use log::{debug, error, info, trace, warn}; use std::{ - borrow::Borrow, + borrow::BorrowMut, net::IpAddr, path::{Path, PathBuf}, thread, @@ -64,7 +64,7 @@ impl ConnectingState { parameters: TunnelParameters, log_dir: &Option<PathBuf>, resource_dir: &Path, - tun_provider: &dyn TunProvider, + tun_provider: &mut dyn TunProvider, retry_attempt: u32, ) -> crate::tunnel::Result<Self> { let (event_tx, event_rx) = mpsc::unbounded(); @@ -350,7 +350,7 @@ impl TunnelState for ConnectingState { tunnel_parameters, &shared_values.log_dir, &shared_values.resource_dir, - shared_values.tun_provider.borrow(), + shared_values.tun_provider.borrow_mut(), retry_attempt, ) { Ok(connecting_state) => { |