diff options
| -rw-r--r-- | mullvad-daemon/src/main.rs | 4 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/mod.rs | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs index 7341653768..57421b3e01 100644 --- a/mullvad-daemon/src/main.rs +++ b/mullvad-daemon/src/main.rs @@ -263,8 +263,8 @@ impl Daemon { fn handle_tunnel_event(&mut self, tunnel_event: TunnelEvent) -> Result<()> { debug!("Tunnel event: {:?}", tunnel_event); if self.state == TunnelState::Connecting { - if let TunnelEvent::Up { dev } = tunnel_event { - self.tunnel_interface = Some(dev); + if let TunnelEvent::Up { tunnel_interface } = tunnel_event { + self.tunnel_interface = Some(tunnel_interface); self.set_security_policy()?; self.set_state(TunnelState::Connected) } else { diff --git a/talpid-core/src/tunnel/mod.rs b/talpid-core/src/tunnel/mod.rs index 49d1d7dd44..a2ab25a487 100644 --- a/talpid-core/src/tunnel/mod.rs +++ b/talpid-core/src/tunnel/mod.rs @@ -48,7 +48,7 @@ pub enum TunnelEvent { /// Sent when the tunnel comes up and is ready for traffic. Up { /// The name of the device which the tunnel is running on. - dev: String, + tunnel_interface: String, }, /// Sent when the tunnel goes down. Down, @@ -62,8 +62,9 @@ impl TunnelEvent { -> Option<TunnelEvent> { match *event { OpenVpnPluginEvent::Up => { - let dev = env.get("dev").expect("No \"dev\" in tunnel up event").to_owned(); - Some(TunnelEvent::Up { dev }) + let tunnel_interface = + env.get("dev").expect("No \"dev\" in tunnel up event").to_owned(); + Some(TunnelEvent::Up { tunnel_interface }) } OpenVpnPluginEvent::RoutePredown => Some(TunnelEvent::Down), _ => None, |