Merge pull request #45 from hnez/dbus-updates

dbus: update bindings with newly introspected ones and other maintainance

Author: hnez

src/dbus.rs

@@ -54,19 +54,22 @@ mod zb {
 
 use zb::{Connection, ConnectionBuilder, Result};
 
+pub mod hostname;
 pub mod networkmanager;
 pub mod rauc;
 pub mod systemd;
 pub mod tacd;
 
 pub use self::systemd::Systemd;
+pub use hostname::Hostname;
 pub use networkmanager::Network;
 pub use rauc::Rauc;
 pub use tacd::Tacd;
 
 /// Bunch together everything that uses a DBus system connection here, even
 /// though it is conceptionally independent
 pub struct DbusSession {
+    pub hostname: Hostname,
     pub network: Network,
     pub rauc: Rauc,
     pub systemd: Systemd,
@@ -88,6 +91,7 @@ impl DbusSession {
         let conn = Arc::new(tacd.serve(conn_builder).build().await.unwrap());
 
         Self {
+            hostname: Hostname::new(bb, &conn),
             network: Network::new(bb, &conn, led_dut, led_uplink),
             rauc: Rauc::new(bb, &conn),
             systemd: Systemd::new(bb, &conn).await,

src/dbus/hostname.rs

@@ -0,0 +1,65 @@
+// This file is part of tacd, the LXA TAC system daemon
+// Copyright (C) 2023 Pengutronix e.K.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with this program; if not, write to the Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+#[cfg(not(feature = "demo_mode"))]
+use async_std::stream::StreamExt;
+
+#[cfg(not(feature = "demo_mode"))]
+use zbus::Connection;
+
+use crate::broker::{BrokerBuilder, Topic};
+use async_std::sync::Arc;
+
+mod hostnamed;
+
+pub struct Hostname {
+    pub hostname: Arc<Topic<String>>,
+}
+
+impl Hostname {
+    #[cfg(feature = "demo_mode")]
+    pub fn new<C>(bb: &mut BrokerBuilder, _conn: C) -> Self {
+        Self {
+            hostname: bb.topic_ro("/v1/tac/network/hostname", Some("lxatac".into())),
+        }
+    }
+
+    #[cfg(not(feature = "demo_mode"))]
+    pub fn new(bb: &mut BrokerBuilder, conn: &Arc<Connection>) -> Self {
+        let hostname = bb.topic_ro("/v1/tac/network/hostname", None);
+
+        let conn = conn.clone();
+        let hostname_topic = hostname.clone();
+        async_std::task::spawn(async move {
+            let proxy = hostnamed::HostnameProxy::new(&conn).await.unwrap();
+
+            let mut stream = proxy.receive_hostname_changed().await;
+
+            if let Ok(h) = proxy.hostname().await {
+                hostname_topic.set(h);
+            }
+
+            while let Some(v) = stream.next().await {
+                if let Ok(h) = v.get().await {
+                    hostname_topic.set(h);
+                }
+            }
+        });
+
+        Self { hostname }
+    }
+}

src/dbus/hostname/hostnamed.rs

@@ -0,0 +1,116 @@
+//! This code was generated by `zbus-xmlgen` `3.1.1` from DBus introspection data.
+//!
+//! By running `zbus-xmlgen --system org.freedesktop.hostname1 /org/freedesktop/hostname1`
+//! on the LXA TAC.
+
+use zbus::dbus_proxy;
+
+#[dbus_proxy(
+    interface = "org.freedesktop.hostname1",
+    default_service = "org.freedesktop.hostname1",
+    default_path = "/org/freedesktop/hostname1"
+)]
+trait Hostname {
+    /// Describe method
+    fn describe(&self) -> zbus::Result<String>;
+
+    /// GetHardwareSerial method
+    fn get_hardware_serial(&self) -> zbus::Result<String>;
+
+    /// GetProductUUID method
+    #[dbus_proxy(name = "GetProductUUID")]
+    fn get_product_uuid(&self, interactive: bool) -> zbus::Result<Vec<u8>>;
+
+    /// SetChassis method
+    fn set_chassis(&self, chassis: &str, interactive: bool) -> zbus::Result<()>;
+
+    /// SetDeployment method
+    fn set_deployment(&self, deployment: &str, interactive: bool) -> zbus::Result<()>;
+
+    /// SetHostname method
+    fn set_hostname(&self, hostname: &str, interactive: bool) -> zbus::Result<()>;
+
+    /// SetIconName method
+    fn set_icon_name(&self, icon: &str, interactive: bool) -> zbus::Result<()>;
+
+    /// SetLocation method
+    fn set_location(&self, location: &str, interactive: bool) -> zbus::Result<()>;
+
+    /// SetPrettyHostname method
+    fn set_pretty_hostname(&self, hostname: &str, interactive: bool) -> zbus::Result<()>;
+
+    /// SetStaticHostname method
+    fn set_static_hostname(&self, hostname: &str, interactive: bool) -> zbus::Result<()>;
+
+    /// Chassis property
+    #[dbus_proxy(property)]
+    fn chassis(&self) -> zbus::Result<String>;
+
+    /// DefaultHostname property
+    #[dbus_proxy(property)]
+    fn default_hostname(&self) -> zbus::Result<String>;
+
+    /// Deployment property
+    #[dbus_proxy(property)]
+    fn deployment(&self) -> zbus::Result<String>;
+
+    /// FirmwareVersion property
+    #[dbus_proxy(property)]
+    fn firmware_version(&self) -> zbus::Result<String>;
+
+    /// HardwareModel property
+    #[dbus_proxy(property)]
+    fn hardware_model(&self) -> zbus::Result<String>;
+
+    /// HardwareVendor property
+    #[dbus_proxy(property)]
+    fn hardware_vendor(&self) -> zbus::Result<String>;
+
+    /// HomeURL property
+    #[dbus_proxy(property, name = "HomeURL")]
+    fn home_url(&self) -> zbus::Result<String>;
+
+    /// Hostname property
+    #[dbus_proxy(property)]
+    fn hostname(&self) -> zbus::Result<String>;
+
+    /// HostnameSource property
+    #[dbus_proxy(property)]
+    fn hostname_source(&self) -> zbus::Result<String>;
+
+    /// IconName property
+    #[dbus_proxy(property)]
+    fn icon_name(&self) -> zbus::Result<String>;
+
+    /// KernelName property
+    #[dbus_proxy(property)]
+    fn kernel_name(&self) -> zbus::Result<String>;
+
+    /// KernelRelease property
+    #[dbus_proxy(property)]
+    fn kernel_release(&self) -> zbus::Result<String>;
+
+    /// KernelVersion property
+    #[dbus_proxy(property)]
+    fn kernel_version(&self) -> zbus::Result<String>;
+
+    /// Location property
+    #[dbus_proxy(property)]
+    fn location(&self) -> zbus::Result<String>;
+
+    /// OperatingSystemCPEName property
+    #[dbus_proxy(property, name = "OperatingSystemCPEName")]
+    fn operating_system_cpename(&self) -> zbus::Result<String>;
+
+    /// OperatingSystemPrettyName property
+    #[dbus_proxy(property)]
+    fn operating_system_pretty_name(&self) -> zbus::Result<String>;
+
+    /// PrettyHostname property
+    #[dbus_proxy(property)]
+    fn pretty_hostname(&self) -> zbus::Result<String>;
+
+    /// StaticHostname property
+    #[dbus_proxy(property)]
+    fn static_hostname(&self) -> zbus::Result<String>;
+}

src/dbus/networkmanager/mod.rs renamed to src/dbus/networkmanager.rs

@@ -23,8 +23,16 @@ use serde::{Deserialize, Serialize};
 use crate::broker::{BrokerBuilder, Topic};
 use crate::led::BlinkPattern;
 
+// Macro use makes these modules quite heavy, so we keep them commented
+// out until they are actually used
+//mod active_connection;
 mod devices;
-mod hostname;
+//mod dhcp4_config;
+//mod dhcp6_config;
+mod ipv4_config;
+//mod ipv6_config;
+mod manager;
+//mod settings;
 
 // All of the following includes are not used in demo_mode.
 // Put them inside a mod so we do not have to decorate each one with
@@ -39,14 +47,15 @@ mod optional_includes {
     pub(super) use std::time::Duration;
     pub(super) use zbus::{Connection, PropertyStream};
     pub(super) use zvariant::{ObjectPath, OwnedObjectPath};
+
+    pub(super) use super::devices::{DeviceProxy, WiredProxy};
+    pub(super) use super::ipv4_config::IP4ConfigProxy;
+    pub(super) use super::manager::NetworkManagerProxy;
 }
 
 #[cfg(not(feature = "demo_mode"))]
 use optional_includes::*;
 
-#[allow(clippy::module_inception)]
-mod networkmanager;
-
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct LinkInfo {
     pub speed: u32,
@@ -55,14 +64,11 @@ pub struct LinkInfo {
 
 #[cfg(not(feature = "demo_mode"))]
 async fn path_from_interface(con: &Connection, interface: &str) -> Result<OwnedObjectPath> {
-    let proxy = networkmanager::NetworkManagerProxy::new(con).await?;
+    let proxy = NetworkManagerProxy::new(con).await?;
     let device_paths = proxy.get_devices().await?;
 
     for path in device_paths {
-        let device_proxy = devices::DeviceProxy::builder(con)
-            .path(&path)?
-            .build()
-            .await?;
+        let device_proxy = DeviceProxy::builder(con).path(&path)?.build().await?;
 
         let interface_name = device_proxy.interface().await?; // name
 
@@ -76,10 +82,7 @@ async fn path_from_interface(con: &Connection, interface: &str) -> Result<OwnedO
 
 #[cfg(not(feature = "demo_mode"))]
 async fn get_link_info(con: &Connection, path: &str) -> Result<LinkInfo> {
-    let eth_proxy = devices::WiredProxy::builder(con)
-        .path(path)?
-        .build()
-        .await?;
+    let eth_proxy = WiredProxy::builder(con).path(path)?.build().await?;
 
     let speed = eth_proxy.speed().await?;
     let carrier = eth_proxy.carrier().await?;
@@ -95,12 +98,9 @@ where
     P: TryInto<ObjectPath<'a>>,
     P::Error: Into<zbus::Error>,
 {
-    let ip_4_proxy = devices::ip4::IP4ConfigProxy::builder(con)
-        .path(path)?
-        .build()
-        .await?;
+    let ip_4_proxy = IP4ConfigProxy::builder(con).path(path)?.build().await?;
 
-    let ip_address = ip_4_proxy.address_data2().await?;
+    let ip_address = ip_4_proxy.address_data().await?;
     trace!("get IPv4: {:?}", ip_address);
     let ip_address = ip_address
         .get(0)
@@ -128,7 +128,7 @@ impl<'a> LinkStream<'a> {
             .as_str()
             .to_string();
 
-        let eth_proxy = devices::WiredProxy::builder(&con)
+        let eth_proxy = WiredProxy::builder(&con)
             .path(path.clone())?
             .build()
             .await?;
@@ -192,7 +192,7 @@ impl<'a> IpStream<'a> {
             .as_str()
             .to_string();
 
-        let device_proxy = devices::DeviceProxy::builder(&con)
+        let device_proxy = DeviceProxy::builder(&con)
             .path(path.clone())?
             .build()
             .await?;
@@ -208,7 +208,7 @@ impl<'a> IpStream<'a> {
     }
 
     pub async fn now(&mut self, con: &Connection) -> Result<Vec<String>> {
-        let device_proxy = devices::DeviceProxy::builder(con)
+        let device_proxy = DeviceProxy::builder(con)
             .path(self.path.as_str())?
             .build()
             .await?;
@@ -237,7 +237,6 @@ impl<'a> IpStream<'a> {
 }
 
 pub struct Network {
-    pub hostname: Arc<Topic<String>>,
     pub bridge_interface: Arc<Topic<Vec<String>>>,
     pub dut_interface: Arc<Topic<LinkInfo>>,
     pub uplink_interface: Arc<Topic<LinkInfo>>,
@@ -246,7 +245,6 @@ pub struct Network {
 impl Network {
     fn setup_topics(bb: &mut BrokerBuilder) -> Self {
         Self {
-            hostname: bb.topic_ro("/v1/tac/network/hostname", None),
             bridge_interface: bb.topic_ro("/v1/tac/network/interface/tac-bridge", None),
             dut_interface: bb.topic_ro("/v1/tac/network/interface/dut", None),
             uplink_interface: bb.topic_ro("/v1/tac/network/interface/uplink", None),
@@ -262,7 +260,6 @@ impl Network {
     ) -> Self {
         let this = Self::setup_topics(bb);
 
-        this.hostname.set("lxatac".to_string());
         this.bridge_interface.set(vec![String::from("192.168.1.1")]);
         this.dut_interface.set(LinkInfo {
             speed: 0,
@@ -285,26 +282,6 @@ impl Network {
     ) -> Self {
         let this = Self::setup_topics(bb);
 
-        {
-            let conn = conn.clone();
-            let hostname_topic = this.hostname.clone();
-            async_std::task::spawn(async move {
-                let proxy = hostname::HostnameProxy::new(&conn).await.unwrap();
-
-                let mut stream = proxy.receive_hostname_changed().await;
-
-                if let Ok(h) = proxy.hostname().await {
-                    hostname_topic.set(h);
-                }
-
-                while let Some(v) = stream.next().await {
-                    if let Ok(h) = v.get().await {
-                        hostname_topic.set(h);
-                    }
-                }
-            });
-        }
-
         {
             let conn = conn.clone();
             let dut_interface = this.dut_interface.clone();