ooh cool

src/utils/mod.rs

@@ -5,9 +5,8 @@
 //     [0xbc, 0x09, 0x1b, 0xec, 0x65, 0xd0],
 // ];
 
-/// is it time to lookup host lda.lan for this...
+// is it time to lookup host lda.lan for this...
 // pub static LDA_MACS_2: LazyLock<[MacAddr; 2]> = LazyLock::new(|| LDA_MACS.map(MacAddr::from));
-pub mod wake;
 
 /// generic so you can do "123.45.67.89:22" or "lda.lan:22" as an input
 // this is so bad

src/utils/query.rs

@@ -0,0 +1,48 @@
+pub mod dev {
+    pub use wakey_linux::devices::devs_sorted;
+}
+pub mod leases {
+    pub use wakey_linux::dhcp::enrich_leases_with_nud_state;
+}
+
+pub mod parser {
+    pub use wakey_core::QueryInput as QueryType;
+
+    pub async fn parse_query(q: String) -> QueryType {
+        wakey_linux::devices::classify_query(q).await
+    }
+}
+
+pub use leases::*;
+pub use macs::*;
+
+pub mod macs {
+    use anyhow::Result;
+    use std::net::IpAddr;
+
+    use crate::arpparse::{IpNeighLine, NUDState};
+
+    pub async fn get_ips(machine_name: &str) -> Result<impl Iterator<Item = IpAddr>> {
+        wakey_linux::devices::get_ips(machine_name).await
+    }
+
+    pub async fn get_macs(
+        machine_names: &[impl AsRef<str>],
+        ips: &[IpAddr],
+        devs: &[impl AsRef<str>],
+        state: &[NUDState],
+        macs: &[macaddr::MacAddr],
+    ) -> Result<Vec<IpNeighLine>> {
+        wakey_linux::devices::get_neighbors(machine_names, ips, devs, state, macs).await
+    }
+
+    pub async fn get_mac(
+        ip: Option<IpAddr>,
+        dev: Option<&str>,
+        state: &[NUDState],
+    ) -> Result<Vec<IpNeighLine>> {
+        let ips: Vec<IpAddr> = ip.into_iter().collect();
+        let devs: Vec<&str> = dev.into_iter().collect();
+        get_macs(&[] as &[&str], &ips, &devs, state, &[]).await
+    }
+}

src/utils/query/macs.rs

@@ -1,28 +0,0 @@
-use anyhow::Result;
-use std::net::IpAddr;
-
-use crate::arpparse::{IpNeighLine, NUDState};
-
-pub async fn get_ips(machine_name: &str) -> Result<impl Iterator<Item = IpAddr>> {
-    wakey_linux::devices::get_ips(machine_name).await
-}
-
-pub async fn get_macs(
-    machine_names: &[impl AsRef<str>],
-    ips: &[IpAddr],
-    devs: &[impl AsRef<str>],
-    state: &[NUDState],
-    macs: &[macaddr::MacAddr],
-) -> Result<Vec<IpNeighLine>> {
-    wakey_linux::devices::get_neighbors(machine_names, ips, devs, state, macs).await
-}
-
-pub async fn get_mac(
-    ip: Option<IpAddr>,
-    dev: Option<&str>,
-    state: &[NUDState],
-) -> Result<Vec<IpNeighLine>> {
-    let ips: Vec<IpAddr> = ip.into_iter().collect();
-    let devs: Vec<&str> = dev.into_iter().collect();
-    get_macs(&[] as &[&str], &ips, &devs, state, &[]).await
-}

src/utils/query/mod.rs

@@ -1,17 +0,0 @@
-pub mod dev {
-    pub use wakey_linux::devices::devs_sorted;
-}
-pub mod leases {
-    pub use wakey_linux::dhcp::enrich_leases_with_nud_state;
-}
-pub mod macs;
-pub mod parser {
-    pub use wakey_core::QueryInput as QueryType;
-
-    pub async fn parse_query(q: String) -> QueryType {
-        wakey_linux::devices::classify_query(q).await
-    }
-}
-
-pub use leases::*;
-pub use macs::*;

src/utils/wake.rs

@@ -1,6 +0,0 @@
-pub async fn wake_one(
-    sock: &tokio::net::UdpSocket,
-    t: wakey_linux::wake::CompleteWakeTarget,
-) -> wakey_core::WakeTargetResult {
-    wakey_linux::wake::wake_one(sock, t).await
-}