summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEmīls <emils@mullvad.net>2021-01-08 05:41:03 +0000
committerEmīls <emils@mullvad.net>2021-01-12 10:24:38 +0000
commit208d99cc9d3ddc08149c152458637a2955aec411 (patch)
treea4f4f44ddcddfa2046e9b3bce5891de73400a023
parent42db82ed22f388167ac09d7a49b9d22b6b4bd3b4 (diff)
downloadmullvadvpn-208d99cc9d3ddc08149c152458637a2955aec411.tar.xz
mullvadvpn-208d99cc9d3ddc08149c152458637a2955aec411.zip
Expose NM version
-rw-r--r--talpid-dbus/src/network_manager.rs12
1 files changed, 8 insertions, 4 deletions
diff --git a/talpid-dbus/src/network_manager.rs b/talpid-dbus/src/network_manager.rs
index 9c1d986a31..9253a68ac8 100644
--- a/talpid-dbus/src/network_manager.rs
+++ b/talpid-dbus/src/network_manager.rs
@@ -184,10 +184,9 @@ impl NetworkManager {
}
fn ensure_nm_is_new_enough_for_wireguard(&self) -> Result<()> {
- let manager = self.nm_manager();
- let version_string: String = manager.get(NM_MANAGER, "Version").map_err(Error::Dbus)?;
- let version_too_old = || Error::NMTooOld(version_string.clone());
- let mut parts = version_string
+ let version: String = self.version()?;
+ let version_too_old = || Error::NMTooOld(version.clone());
+ let mut parts = version
.split(".")
.map(|part| part.parse().map_err(|_| version_too_old()));
@@ -204,6 +203,11 @@ impl NetworkManager {
}
}
+ pub fn version(&self) -> Result<String> {
+ let manager = self.nm_manager();
+ manager.get(NM_MANAGER, "Version").map_err(Error::Dbus)
+ }
+
fn add_connection_2(
&self,
settings_map: &DeviceConfig,