diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-11-14 17:56:29 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-11-14 17:56:29 +0100 |
| commit | 840d8d4e2605999f1f7e3b88babeca6b04a1b5b1 (patch) | |
| tree | 96c7f2dff2817815cb043ac47bb060430fcbd66d /gui | |
| parent | ca6b495ce6792ecc266b133c2c9d97a0827e2219 (diff) | |
| parent | aebb607a9f21a4994dbc4a82bd28138dc2151ff9 (diff) | |
| download | mullvadvpn-840d8d4e2605999f1f7e3b88babeca6b04a1b5b1.tar.xz mullvadvpn-840d8d4e2605999f1f7e3b88babeca6b04a1b5b1.zip | |
Merge branch 'reset-dns-more-often'
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/packages/desktop/src/renderer/components/NotificationArea.js | 2 | ||||
| -rw-r--r-- | gui/packages/desktop/src/renderer/lib/daemon-rpc.js | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/gui/packages/desktop/src/renderer/components/NotificationArea.js b/gui/packages/desktop/src/renderer/components/NotificationArea.js index 936a29b5d0..a3d4625be8 100644 --- a/gui/packages/desktop/src/renderer/components/NotificationArea.js +++ b/gui/packages/desktop/src/renderer/components/NotificationArea.js @@ -41,6 +41,8 @@ function getBlockReasonMessage(blockReason: BlockReason): string { return 'Could not configure IPv6, please enable it on your system or disable it in the app'; case 'set_security_policy_error': return 'Failed to apply security policy'; + case 'set_dns_error': + return 'Failed to set system DNS server'; case 'start_tunnel_error': return 'Failed to start tunnel connection'; case 'no_matching_relay': diff --git a/gui/packages/desktop/src/renderer/lib/daemon-rpc.js b/gui/packages/desktop/src/renderer/lib/daemon-rpc.js index 5417ec4f21..a37ebdd5a8 100644 --- a/gui/packages/desktop/src/renderer/lib/daemon-rpc.js +++ b/gui/packages/desktop/src/renderer/lib/daemon-rpc.js @@ -49,6 +49,7 @@ export type BlockReason = reason: | 'ipv6_unavailable' | 'set_security_policy_error' + | 'set_dns_error' | 'start_tunnel_error' | 'no_matching_relay' | 'is_offline', @@ -309,6 +310,7 @@ const TunnelStateTransitionSchema = oneOf( reason: enumeration( 'ipv6_unavailable', 'set_security_policy_error', + 'set_dns_error', 'start_tunnel_error', 'no_matching_relay', 'is_offline', |