diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-10-29 16:40:09 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-11-16 13:18:54 +0100 |
| commit | 79a221109c3a361d699779ae66a45f3d7b8c79b7 (patch) | |
| tree | 0467794e2ffce4ed5325d4db9694776479434736 | |
| parent | 3b69022ce136824985f6ffe13d23908de3d610dc (diff) | |
| download | mullvadvpn-79a221109c3a361d699779ae66a45f3d7b8c79b7.tar.xz mullvadvpn-79a221109c3a361d699779ae66a45f3d7b8c79b7.zip | |
Remove deprecated NetworkManager option
| -rw-r--r-- | talpid-core/src/dns/linux/network_manager.rs | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/talpid-core/src/dns/linux/network_manager.rs b/talpid-core/src/dns/linux/network_manager.rs index 1e170bed11..d127f22085 100644 --- a/talpid-core/src/dns/linux/network_manager.rs +++ b/talpid-core/src/dns/linux/network_manager.rs @@ -172,12 +172,6 @@ impl NetworkManager { .get(NM_DEVICE, "Ip4Config") .map_err(Error::Dbus)?; - let device_routes: Vec<Vec<u32>> = self - .dbus_connection - .with_path(NM_BUS, &device_ip4_config, RPC_TIMEOUT_MS) - .get(NM_IP4_CONFIG, "Routes") - .map_err(Error::Dbus)?; - let device_route_data: Vec<HashMap<String, Variant<Box<dyn RefArg>>>> = self .dbus_connection .with_path(NM_BUS, &device_ip4_config, RPC_TIMEOUT_MS) @@ -185,8 +179,8 @@ impl NetworkManager { .map_err(Error::Dbus)?; ipv4_settings.insert("route-metric", Variant(Box::new(0u32))); - ipv4_settings.insert("routes", Variant(Box::new(device_routes))); ipv4_settings.insert("route-data", Variant(Box::new(device_route_data))); + ipv4_settings.remove("routes"); } if let Some(ipv6_settings) = settings.get_mut("ipv6") { @@ -201,13 +195,6 @@ impl NetworkManager { .with_path(NM_BUS, &device_ip6_config, RPC_TIMEOUT_MS) .get(NM_IP6_CONFIG, "Addresses") .map_err(Error::Dbus)?; - - let device_routes6: Vec<(Vec<u8>, u32, Vec<u8>, u32)> = self - .dbus_connection - .with_path(NM_BUS, &device_ip6_config, RPC_TIMEOUT_MS) - .get(NM_IP6_CONFIG, "Routes") - .map_err(Error::Dbus)?; - let device_route6_data: Vec<HashMap<String, Variant<Box<dyn RefArg>>>> = self .dbus_connection .with_path(NM_BUS, &device_ip6_config, RPC_TIMEOUT_MS) @@ -215,7 +202,7 @@ impl NetworkManager { .map_err(Error::Dbus)?; ipv6_settings.insert("route-metric", Variant(Box::new(0u32))); - ipv6_settings.insert("routes", Variant(Box::new(device_routes6))); + ipv6_settings.remove("routes"); ipv6_settings.insert("route-data", Variant(Box::new(device_route6_data))); // if the link contains link local addresses, addresses shouldn't be reset if ipv6_settings |