summaryrefslogtreecommitdiffhomepage
path: root/talpid-core
diff options
context:
space:
mode:
authorEmīls Piņķis <emils@mullvad.net>2019-02-14 13:08:20 +0000
committerEmīls Piņķis <emils@mullvad.net>2019-02-14 13:08:20 +0000
commita08660ec31bca11a19abefeaa9422dd424f8c5e6 (patch)
treeebfaacc0a5cd6c87fe8c23f806bf04d086ff0380 /talpid-core
parentf3e8cec22e848f8df5a199cae4c7ef2d2c7a4d3e (diff)
parent911284d92729c38a69d3e55c404bbb18bd96abfb (diff)
downloadmullvadvpn-a08660ec31bca11a19abefeaa9422dd424f8c5e6.tar.xz
mullvadvpn-a08660ec31bca11a19abefeaa9422dd424f8c5e6.zip
Merge branch 'bump-nm-timeout'
Diffstat (limited to 'talpid-core')
-rw-r--r--talpid-core/src/dns/linux/network_manager.rs2
1 files changed, 1 insertions, 1 deletions
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";