refractoring done

Author: irvingoujAtDevolution

Cargo.lock

@@ -23,6 +23,7 @@ tokio = { version = "1.44", features = ["rt", "sync", "time", "fs"] }
 tracing = "0.1"
 typed-builder = "0.19"
 serde = "1"
+derive_more = { version = "2.0.1", features = ["from"] }
 
 [target.'cfg(target_os = "windows")'.dependencies]
 ipconfig = "0.3"

crates/network-scanner/Cargo.toml

@@ -8,7 +8,7 @@ use network_scanner::task_utils::TaskManager;
 #[tokio::main]
 pub async fn main() -> anyhow::Result<()> {
     tracing_subscriber::fmt::SubscriberBuilder::default()
-        .with_max_level(tracing::Level::DEBUG)
+        .with_max_level(tracing::Level::INFO)
         .with_thread_names(true)
         .init();
 

crates/network-scanner/examples/mdns.rs

@@ -4,6 +4,7 @@ use std::net::Ipv4Addr;
 use std::time::Duration;
 
 use network_scanner::task_utils::TaskManager;
+use tracing::info;
 
 #[tokio::main]
 pub async fn main() -> anyhow::Result<()> {
@@ -29,8 +30,8 @@ pub async fn main() -> anyhow::Result<()> {
         TaskManager::new(),
     )?;
 
-    while let Some((ip, name)) = receiver.recv().await {
-        println!("{}: {:?}", ip, name);
+    while let Some(event) = receiver.recv().await {
+        info!(?event)
     }
 
     Ok(())

crates/network-scanner/examples/netbios.rs

@@ -2,7 +2,11 @@
 
 use std::time::Duration;
 
-use network_scanner::task_utils::TaskManager;
+use network_scanner::{
+    named_port::{MaybeNamedPort, NamedPort},
+    task_utils::TaskManager,
+};
+use tracing::info;
 
 #[tokio::main]
 pub async fn main() {
@@ -14,14 +18,19 @@ pub async fn main() {
     let runtime = network_scanner_net::runtime::Socket2Runtime::new(None).expect("failed to create runtime");
 
     let ip = std::net::Ipv4Addr::new(127, 0, 0, 1);
-    // let port = 22,80,443,12345,3399,88
-    let port = vec![22, 80, 443, 12345, 3399, 88];
+    let ports: Vec<MaybeNamedPort> = vec![
+        NamedPort::Ssh.into(),
+        80.into(),
+        NamedPort::Https.into(),
+        389.into(),
+        636.into(),
+    ];
     let mut res =
-        network_scanner::port_discovery::scan_ports(ip, &port, runtime, Duration::from_secs(5), TaskManager::new())
+        network_scanner::port_discovery::scan_ports(ip, &ports, runtime, Duration::from_secs(5), TaskManager::new())
             .await
             .expect("failed to scan ports");
 
-    while let Some(res) = res.recv().await {
-        tracing::warn!("Port scan result: {:?}", res);
+    while let Some(event) = res.recv().await {
+        info!(?event);
     }
 }

crates/network-scanner/examples/port_discovery.rs

@@ -3,21 +3,34 @@
 use std::time::Duration;
 
 use anyhow::Context;
-use network_scanner::scanner::{NetworkScanner, NetworkScannerParams, ScannerConfig, ScannerToggles};
+use network_scanner::{
+    event_bus::{ScannerEvent, TypedReceiver},
+    named_port::{MaybeNamedPort, NamedPort},
+    port_discovery::TcpKnockEvent,
+    scanner::{DnsEvent, NetworkScanner, NetworkScannerParams, ScannerConfig, ScannerToggles},
+};
 use tokio::time::timeout;
 
 fn main() -> anyhow::Result<()> {
     tracing_subscriber::fmt::SubscriberBuilder::default()
         .with_max_level(tracing::Level::INFO)
-        .with_file(true)
-        .with_line_number(true)
+        .with_file(false)
         .with_thread_names(true)
+        .with_ansi(false)
         .init();
 
+    let ports: Vec<MaybeNamedPort> = vec![
+        NamedPort::Ssh.into(),
+        80.into(),
+        NamedPort::Https.into(),
+        389.into(),
+        636.into(),
+    ];
+
     let params = NetworkScannerParams {
         config: ScannerConfig {
             ip_ranges: vec![],
-            ports: vec![22, 80, 443, 389, 636],
+            ports,
             ping_interval: Duration::from_millis(20),
             ping_timeout: Duration::from_millis(1000),
             broadcast_timeout: Duration::from_millis(2000),
@@ -29,7 +42,6 @@ fn main() -> anyhow::Result<()> {
         },
         toggle: ScannerToggles {
             enable_broadcast: true,
-            enable_ping_start: true,
             enable_resolve_dns: true,
             enable_subnet_scan: true,
             enable_zeroconf: true,
@@ -45,11 +57,13 @@ fn main() -> anyhow::Result<()> {
                 tracing::info!("Ctrl-C received, stopping network scan");
             }
         });
-        while let Ok(Some(res)) = timeout(Duration::from_secs(120), stream.recv()).await.with_context(|| {
+
+        let mut receiver: TypedReceiver<InterestedEvent> = stream.subscribe().await;
+        while let Ok(event) = receiver.recv().await.with_context(|| {
             tracing::error!("Failed to receive from stream");
             "Failed to receive from stream"
         }) {
-            tracing::warn!("Result: {:?}", res);
+            tracing::info!(?event);
         }
 
         stream.stop();
@@ -60,3 +74,21 @@ fn main() -> anyhow::Result<()> {
     tracing::info!("Done");
     Ok(())
 }
+
+#[derive(Debug)]
+pub enum InterestedEvent {
+    Dns(DnsEvent),
+    TcpKnock(TcpKnockEvent),
+}
+
+impl TryFrom<ScannerEvent> for InterestedEvent {
+    type Error = ();
+
+    fn try_from(event: ScannerEvent) -> Result<Self, Self::Error> {
+        match event {
+            ScannerEvent::Dns(dns) => Ok(InterestedEvent::Dns(dns)),
+            ScannerEvent::TcpKnock(tcp_knock) => Ok(InterestedEvent::TcpKnock(tcp_knock)),
+            _ => Err(()),
+        }
+    }
+}