summaryrefslogtreecommitdiffhomepage
path: root/mullvad-daemon/src
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-06-27 20:25:45 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-06-28 19:18:45 +0000
commitd91a855e6b7981e90f7cd9f6d2374dcb54cd04bb (patch)
treee3d66089e74e9414b7624e414f28efa1ab14a9a3 /mullvad-daemon/src
parentea3466c3bf5eb16619d67bd61e27d635d879c51b (diff)
downloadmullvadvpn-d91a855e6b7981e90f7cd9f6d2374dcb54cd04bb.tar.xz
mullvadvpn-d91a855e6b7981e90f7cd9f6d2374dcb54cd04bb.zip
Change how tunnel endpoint is broadcasted
Diffstat (limited to 'mullvad-daemon/src')
-rw-r--r--mullvad-daemon/src/lib.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs
index eacb9a2197..c887caa50f 100644
--- a/mullvad-daemon/src/lib.rs
+++ b/mullvad-daemon/src/lib.rs
@@ -456,8 +456,8 @@ where
fn handle_tunnel_state_transition(&mut self, tunnel_state_transition: TunnelStateTransition) {
let tunnel_state = match tunnel_state_transition {
TunnelStateTransition::Disconnected => TunnelState::Disconnected,
- TunnelStateTransition::Connecting(endpoint) => TunnelState::Connecting(endpoint),
- TunnelStateTransition::Connected(endpoint) => TunnelState::Connected(endpoint),
+ TunnelStateTransition::Connecting(endpoint) => TunnelState::Connecting { endpoint },
+ TunnelStateTransition::Connected(endpoint) => TunnelState::Connected { endpoint },
TunnelStateTransition::Disconnecting(after_disconnect) => {
TunnelState::Disconnecting(after_disconnect)
}
@@ -783,12 +783,12 @@ where
let get_location: Box<dyn Future<Item = Option<GeoIpLocation>, Error = ()> + Send> =
match self.tunnel_state {
Disconnected => Box::new(self.get_geo_location().map(Some)),
- Connecting(_) | Disconnecting(..) => match self.build_location_from_relay() {
+ Connecting { .. } | Disconnecting(..) => match self.build_location_from_relay() {
Some(relay_location) => Box::new(future::result(Ok(Some(relay_location)))),
// Custom relay is set, no location is known
None => Box::new(future::result(Ok(None))),
},
- Connected(_) => match self.build_location_from_relay() {
+ Connected { .. } => match self.build_location_from_relay() {
Some(location_from_relay) => Box::new(
self.get_geo_location()
.map(|fetched_location| GeoIpLocation {