diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2019-02-14 13:08:20 +0000 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2019-02-14 13:08:20 +0000 |
| commit | a08660ec31bca11a19abefeaa9422dd424f8c5e6 (patch) | |
| tree | ebfaacc0a5cd6c87fe8c23f806bf04d086ff0380 | |
| parent | f3e8cec22e848f8df5a199cae4c7ef2d2c7a4d3e (diff) | |
| parent | 911284d92729c38a69d3e55c404bbb18bd96abfb (diff) | |
| download | mullvadvpn-a08660ec31bca11a19abefeaa9422dd424f8c5e6.tar.xz mullvadvpn-a08660ec31bca11a19abefeaa9422dd424f8c5e6.zip | |
Merge branch 'bump-nm-timeout'
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | talpid-core/src/dns/linux/network_manager.rs | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a0bd0c1655..eb258739c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,10 +33,16 @@ Line wrap the file at 100 chars. Th - Fix startup failure when network device with a hardware address that's not a MAC address is present. +### Changed +#### Linux +- Increased `NetworkManager` DBus RPC timeout from 1 second to 3 seconds. + + ## [2019.1] - 2019-01-29 This release is identical to 2019.1-beta1 + ## [2019.1-beta1] - 2019-01-25 ### Added - Handle "block when disconnected" extra kill-switch level in the GUI, showing the disconnected diff --git a/talpid-core/src/dns/linux/network_manager.rs b/talpid-core/src/dns/linux/network_manager.rs index aceae68646..d42bb4efab 100644 --- a/talpid-core/src/dns/linux/network_manager.rs +++ b/talpid-core/src/dns/linux/network_manager.rs @@ -35,7 +35,7 @@ const NM_TOP_OBJECT: &str = "org.freedesktop.NetworkManager"; const NM_DNS_MANAGER: &str = "org.freedesktop.NetworkManager.DnsManager"; const NM_DNS_MANAGER_PATH: &str = "/org/freedesktop/NetworkManager/DnsManager"; const NM_OBJECT_PATH: &str = "/org/freedesktop/NetworkManager"; -const RPC_TIMEOUT_MS: i32 = 1000; +const RPC_TIMEOUT_MS: i32 = 3000; const GLOBAL_DNS_CONF_KEY: &str = "GlobalDnsConfiguration"; const RC_MANAGEMENT_MODE_KEY: &str = "RcManager"; |