Added main loop to run continuously and relevant configuration options

oott.toml

@@ -1,7 +1,11 @@
+[networking]
+interface = "eno1" # Network interface to use for scans
+
 [log]
 level = "info" # off, error, warn, info, debug, trace
 
 [timings]
+wait_between_scans="30"
 arp_sender_timeout="30"
 arp_scan_duration="60"
 

sample_oott.toml

@@ -1,9 +1,13 @@
+[networking]
+interface = "eno1" # Network interface to use for scans
+
 [log]
 level = "info" # off, error, warn, info, debug, trace
 
 [timings]
-arp_sender_timeout="30"
+wait_between_scans="900" # Wait time between scans (in seconds). This does not include the scan time
-arp_scan_duration="60"
+arp_sender_timeout="60" # If the ARP sender process takes longer than this (in seconds) it will be stopped (for a class C network - 254 IPs - it should take less than a minute)
+arp_scan_duration="300" # How long to wait (in seconds) for response packets on each scan (300 to 600 seconds is a good timeframe for a class B or C network)
 
 [notifications]
 method="pushover" # For now just pushover, you can set this to "none" to avoid sending notifications (it will just log)

src/device_finders/arp.rs

@@ -9,7 +9,7 @@ use pnet::{
 };
 use tokio::time::{Duration, timeout};
 
-pub async fn find(interface: &str) -> Result<Vec<Device>, String> {
+pub async fn find(interface: String) -> Result<Vec<Device>, String> {
     debug!("Looking up devices via ARP using interface {}", interface);
 
     // Get the network device to use

src/main.rs

@@ -1,7 +1,7 @@
+use crate::settings::CONFIG;
 use log::{LevelFilter, debug, info};
 use std::sync::{Arc, Mutex};
-
+use tokio::time::{Duration, sleep};
-use crate::settings::CONFIG;
 
 mod db;
 mod device_finders;
@@ -33,8 +33,9 @@ async fn main() -> Result<(), String> {
     // Get database connection - thread protected
     let db_conn = Arc::new(Mutex::new(db::init_db().unwrap()));
 
+    loop {
         // Find online devices via ARP
-    let devices = device_finders::arp::find("eno1").await.unwrap();
+        let devices = device_finders::arp::find(CONFIG.networking.interface.to_string()).await?;
 
         info!("Done with ARP probes");
         info!("Found {} online devices", devices.iter().count());
@@ -73,8 +74,10 @@ async fn main() -> Result<(), String> {
                 }
             };
         }
-
+        info!(
-    info!("Exiting");
+            "Scan finished. Sleeping for {} seconds",
-
+            CONFIG.timings.wait_between_scans
-    Ok(())
+        );
+        sleep(Duration::from_secs(CONFIG.timings.wait_between_scans)).await;
+    }
 }

src/settings.rs

@@ -5,6 +5,12 @@ use serde::Deserialize;
 
 // -----------------------------------------------------------
 // Configuration structure
+
+#[derive(Debug, Deserialize, Clone)]
+pub struct Networking {
+    pub interface: String,
+}
+
 #[derive(Debug, Deserialize, Clone)]
 pub struct Log {
     pub level: String,
@@ -12,6 +18,7 @@ pub struct Log {
 
 #[derive(Debug, Deserialize, Clone)]
 pub struct Timings {
+    pub wait_between_scans: u64,
     pub arp_sender_timeout: u64,
     pub arp_scan_duration: u64,
 }
@@ -30,6 +37,7 @@ pub struct Notifications {
 
 #[derive(Debug, Deserialize, Clone)]
 pub struct Settings {
+    pub networking: Networking,
     pub log: Log,
     pub timings: Timings,
     pub notifications: Notifications,