diff options
| author | Emīls <emils@mullvad.net> | 2020-08-26 11:46:17 +0100 |
|---|---|---|
| committer | Emīls <emils@mullvad.net> | 2020-09-02 10:58:47 +0100 |
| commit | f39d70ea03376f4a67955303a6fbc7fd559d98b7 (patch) | |
| tree | 16707ec18f26fef519ea3583f876c94899679166 | |
| parent | ccd92467d7f1f21531166e61e65092b0ed5ae53e (diff) | |
| download | mullvadvpn-f39d70ea03376f4a67955303a6fbc7fd559d98b7.tar.xz mullvadvpn-f39d70ea03376f4a67955303a6fbc7fd559d98b7.zip | |
Adjust tunnel trait
| -rw-r--r-- | talpid-core/src/tunnel/wireguard/connectivity_check.rs | 4 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/wireguard/mod.rs | 4 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/wireguard/wireguard_go.rs | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/talpid-core/src/tunnel/wireguard/connectivity_check.rs b/talpid-core/src/tunnel/wireguard/connectivity_check.rs index 111edd772a..8a604fcf6f 100644 --- a/talpid-core/src/tunnel/wireguard/connectivity_check.rs +++ b/talpid-core/src/tunnel/wireguard/connectivity_check.rs @@ -514,8 +514,8 @@ mod test { } impl Tunnel for MockTunnel { - fn get_interface_name(&self) -> &str { - "mock-tunnel" + fn get_interface_name(&self) -> String { + "mock-tunnel".to_string() } fn stop(self: Box<Self>) -> Result<(), TunnelError> { diff --git a/talpid-core/src/tunnel/wireguard/mod.rs b/talpid-core/src/tunnel/wireguard/mod.rs index 6324d13e80..ef9b2cabf8 100644 --- a/talpid-core/src/tunnel/wireguard/mod.rs +++ b/talpid-core/src/tunnel/wireguard/mod.rs @@ -93,7 +93,7 @@ impl WireguardMonitor { let close_sender = monitor.close_msg_sender.clone(); let mut connectivity_monitor = connectivity_check::ConnectivityMonitor::new( gateway, - iface_name, + iface_name.to_string(), Arc::downgrade(&monitor.tunnel), pinger_rx, )?; @@ -228,7 +228,7 @@ impl CloseHandle { } pub(crate) trait Tunnel: Send { - fn get_interface_name(&self) -> &str; + fn get_interface_name(&self) -> String; fn stop(self: Box<Self>) -> std::result::Result<(), TunnelError>; fn get_tunnel_stats(&self) -> std::result::Result<stats::Stats, TunnelError>; } diff --git a/talpid-core/src/tunnel/wireguard/wireguard_go.rs b/talpid-core/src/tunnel/wireguard/wireguard_go.rs index 761276dcdf..b4d437f046 100644 --- a/talpid-core/src/tunnel/wireguard/wireguard_go.rs +++ b/talpid-core/src/tunnel/wireguard/wireguard_go.rs @@ -283,8 +283,8 @@ impl Drop for WgGoTunnel { } impl Tunnel for WgGoTunnel { - fn get_interface_name(&self) -> &str { - &self.interface_name + fn get_interface_name(&self) -> String { + self.interface_name.clone() } fn get_tunnel_stats(&self) -> Result<Stats> { |