Merge branch 'wg-remap-ping-error'

3 files changed, 16 insertions, 1 deletions

diff --git a/talpid-core/src/tunnel/mod.rs b/talpid-core/src/tunnel/mod.rs
index d386fd641c..ddfe0139c8 100644
--- a/talpid-core/src/tunnel/mod.rs
+++ b/talpid-core/src/tunnel/mod.rs
@@ -14,7 +14,7 @@ use talpid_types::net::{openvpn as openvpn_types, GenericTunnelOptions, TunnelPa
 pub mod openvpn;
 
 #[cfg(unix)]
-mod wireguard;
+pub mod wireguard;
 
 const OPENVPN_LOG_FILENAME: &str = "openvpn.log";
 const WIREGUARD_LOG_FILENAME: &str = "wireguard.log";
diff --git a/talpid-core/src/tunnel/wireguard/mod.rs b/talpid-core/src/tunnel/wireguard/mod.rs
index 23fab152f3..65897d9d23 100644
--- a/talpid-core/src/tunnel/wireguard/mod.rs
+++ b/talpid-core/src/tunnel/wireguard/mod.rs
@@ -1,3 +1,4 @@
+#![allow(missing_docs)]
 use self::config::Config;
 use super::{TunnelEvent, TunnelMetadata};
 use crate::routing;
diff --git a/talpid-core/src/tunnel_state_machine/connecting_state.rs b/talpid-core/src/tunnel_state_machine/connecting_state.rs
index b073ade768..1588648e4e 100644
--- a/talpid-core/src/tunnel_state_machine/connecting_state.rs
+++ b/talpid-core/src/tunnel_state_machine/connecting_state.rs
@@ -345,6 +345,20 @@ impl TunnelState for ConnectingState {
                         Err(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,
                             };