diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-09-09 21:44:39 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-09-10 15:13:27 +0000 |
| commit | 66158917e4edf08f47bb31b483ef306fecd674f2 (patch) | |
| tree | 27d8071fbc1fae7128b416f74c33bbdd2aef8865 | |
| parent | 22d9ed9588ac1cf49d429fba6906a659f2e5e721 (diff) | |
| download | mullvadvpn-66158917e4edf08f47bb31b483ef306fecd674f2.tar.xz mullvadvpn-66158917e4edf08f47bb31b483ef306fecd674f2.zip | |
Change `create_tun` into `get_tun`
| -rw-r--r-- | mullvad-jni/src/vpn_service_tun_provider.rs | 2 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/tun_provider/mod.rs | 4 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/tun_provider/stub.rs | 2 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/tun_provider/unix.rs | 2 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/wireguard/wireguard_go.rs | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/mullvad-jni/src/vpn_service_tun_provider.rs b/mullvad-jni/src/vpn_service_tun_provider.rs index 3d422d83e0..f7b9f5e49f 100644 --- a/mullvad-jni/src/vpn_service_tun_provider.rs +++ b/mullvad-jni/src/vpn_service_tun_provider.rs @@ -55,7 +55,7 @@ impl VpnServiceTunProvider { } impl TunProvider for VpnServiceTunProvider { - fn create_tun(&self, config: TunConfig) -> Result<Box<dyn Tun>, BoxedError> { + fn get_tun(&mut self, config: TunConfig) -> Result<Box<dyn Tun>, BoxedError> { let env = self .jvm .attach_current_thread() diff --git a/talpid-core/src/tunnel/tun_provider/mod.rs b/talpid-core/src/tunnel/tun_provider/mod.rs index d9578ebbd1..71e8aa0495 100644 --- a/talpid-core/src/tunnel/tun_provider/mod.rs +++ b/talpid-core/src/tunnel/tun_provider/mod.rs @@ -49,8 +49,8 @@ pub trait Tun: Send { /// Factory of tunnel devices. pub trait TunProvider: Send + 'static { - /// Create a tunnel device using the provided configuration. - fn create_tun(&self, config: TunConfig) -> Result<Box<dyn Tun>, BoxedError>; + /// Retrieve a tunnel device with the provided configuration. + fn get_tun(&mut self, config: TunConfig) -> Result<Box<dyn Tun>, BoxedError>; } /// Configuration for creating a tunnel device. diff --git a/talpid-core/src/tunnel/tun_provider/stub.rs b/talpid-core/src/tunnel/tun_provider/stub.rs index 0b94b426bf..0d4f6b1704 100644 --- a/talpid-core/src/tunnel/tun_provider/stub.rs +++ b/talpid-core/src/tunnel/tun_provider/stub.rs @@ -11,7 +11,7 @@ impl Default for StubTunProvider { } impl TunProvider for StubTunProvider { - fn create_tun(&self, _: TunConfig) -> Result<Box<dyn Tun>, BoxedError> { + fn get_tun(&mut self, _: TunConfig) -> Result<Box<dyn Tun>, BoxedError> { unimplemented!(); } } diff --git a/talpid-core/src/tunnel/tun_provider/unix.rs b/talpid-core/src/tunnel/tun_provider/unix.rs index c0715a81bd..461e49a3b6 100644 --- a/talpid-core/src/tunnel/tun_provider/unix.rs +++ b/talpid-core/src/tunnel/tun_provider/unix.rs @@ -29,7 +29,7 @@ impl Default for UnixTunProvider { } impl TunProvider for UnixTunProvider { - fn create_tun(&self, config: TunConfig) -> Result<Box<dyn Tun>, BoxedError> { + fn get_tun(&mut self, config: TunConfig) -> Result<Box<dyn Tun>, BoxedError> { let mut tunnel_device = TunnelDevice::new() .map_err(|cause| BoxedError::new(Error::CreateTunnelDevice(cause)))?; diff --git a/talpid-core/src/tunnel/wireguard/wireguard_go.rs b/talpid-core/src/tunnel/wireguard/wireguard_go.rs index ba0e49f373..a771bfae4a 100644 --- a/talpid-core/src/tunnel/wireguard/wireguard_go.rs +++ b/talpid-core/src/tunnel/wireguard/wireguard_go.rs @@ -23,7 +23,7 @@ impl WgGoTunnel { ) -> Result<Self> { #[cfg_attr(not(target_os = "android"), allow(unused_mut))] let mut tunnel_device = tun_provider - .create_tun(Self::create_tunnel_config(config, routes)) + .get_tun(Self::create_tunnel_config(config, routes)) .map_err(Error::SetupTunnelDeviceError)?; let interface_name: String = tunnel_device.interface_name().to_string(); |
