diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-07-27 15:16:24 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-07-27 15:16:24 +0200 |
| commit | ae29b2d4bb0d23426becd52143e4e20629bf8c97 (patch) | |
| tree | e484a60f99cc450e3b9b8c1e5b624c7d304334df | |
| parent | 710f45f0a6a468e22dbdd3504637802347f368c2 (diff) | |
| parent | 664866db24cdaa6210bc031a2ab01918187e19ab (diff) | |
| download | mullvadvpn-ae29b2d4bb0d23426becd52143e4e20629bf8c97.tar.xz mullvadvpn-ae29b2d4bb0d23426becd52143e4e20629bf8c97.zip | |
Merge branch 'return-fw-error'
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | talpid-core/src/tunnel_state_machine/connecting_state.rs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f56d454fb..ac571d49f6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -52,6 +52,8 @@ Line wrap the file at 100 chars. Th ### Fixed - Fix connectivity monitor for WireGuard not disconnecting from a relay when connectivity is lost. +- Forward firewall errors to the GUI in the connecting state, instead of showing a generic message + about failing to start the tunnel. #### Windows - Fix window flickering by disabling window animations. diff --git a/talpid-core/src/tunnel_state_machine/connecting_state.rs b/talpid-core/src/tunnel_state_machine/connecting_state.rs index 6b762110ae..bb0cd3db19 100644 --- a/talpid-core/src/tunnel_state_machine/connecting_state.rs +++ b/talpid-core/src/tunnel_state_machine/connecting_state.rs @@ -358,7 +358,7 @@ impl TunnelState for ConnectingState { "Failed to apply firewall policy for connecting state" ) ); - ErrorState::enter(shared_values, ErrorStateCause::StartTunnelError) + ErrorState::enter(shared_values, ErrorStateCause::SetFirewallPolicyError) } else { #[cfg(target_os = "linux")] if let Err(error) = shared_values.route_manager.enable_exclusions_routes() { |