diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2019-03-18 11:45:04 +0000 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2019-03-18 12:33:35 +0000 |
| commit | 1d71a89b30f06ec343b07edef099ea3d1f9c6a38 (patch) | |
| tree | b277cf02af2e473a2daddca0b0f3d16704adc67c | |
| parent | 9fe81605c7583ba87d670f9e17333b12e35966eb (diff) | |
| download | mullvadvpn-1d71a89b30f06ec343b07edef099ea3d1f9c6a38.tar.xz mullvadvpn-1d71a89b30f06ec343b07edef099ea3d1f9c6a38.zip | |
Revert hacky workarounds when connecting to wireguard.
| -rw-r--r-- | talpid-core/src/tunnel_state_machine/connecting_state.rs | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/talpid-core/src/tunnel_state_machine/connecting_state.rs b/talpid-core/src/tunnel_state_machine/connecting_state.rs index 78c6deee6b..77c8e41f75 100644 --- a/talpid-core/src/tunnel_state_machine/connecting_state.rs +++ b/talpid-core/src/tunnel_state_machine/connecting_state.rs @@ -346,26 +346,8 @@ impl TunnelState for ConnectingState { log::error!("Failed to start tunnel: {}", error); let block_reason = match *error.kind() { tunnel::ErrorKind::EnableIpv6Error => BlockReason::Ipv6Unavailable, - - #[cfg(unix)] - tunnel::ErrorKind::WirguardTunnelMonitoringError(ref err) => { - match &err { - tunnel::wireguard::ErrorKind::PingTimeoutError => { - if crate::offline::is_offline() { - BlockReason::IsOffline - } else { - BlockReason::StartTunnelError - } - } - _ => BlockReason::StartTunnelError, - } - } _ => BlockReason::StartTunnelError, }; - - let chained_error = error.chain_err(|| "Failed to start tunnel"); - error!("{}", chained_error.display_chain()); - BlockedState::enter(shared_values, block_reason) } } |