Linuxapps/SmartMount
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Feat: Erweitert get_ip_from_mac um Netzwerkparameter und verbessert Logging.

Browse Source
This commit is contained in:
DragonSlayer_14
2025-08-21 00:01:40 +02:00
parent a8c415d8f3
commit dad6a4ee58
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/network/utils.rs
View File

@@ -1,7 +1,7 @@
use std::process::Command;
use std::net::Ipv4Addr;
use crate::log; use crate::log;
use crate::log::LogLevel; use crate::log::LogLevel;
use std::net::Ipv4Addr;
use std::process::Command;
/// Prüft, ob eine angegebene IP-Adresse oder URL erreichbar ist /// Prüft, ob eine angegebene IP-Adresse oder URL erreichbar ist
/// ///
@@ -91,16 +91,19 @@ pub fn get_network_address(address: &str) -> Option<String> {
/// ///
/// # Parameter /// # Parameter
/// - `mac`: MAC-Adresse im Format "xx:xx:xx:xx:xx:xx" /// - `mac`: MAC-Adresse im Format "xx:xx:xx:xx:xx:xx"
/// - `network`: Netzwerkadresse im Format "xxx.xxx.xxx.xxx/yy"
/// ///
/// # Rückgabe /// # Rückgabe
/// - Option<String>: Die IP-Adresse des Geräts oder None wenn nicht gefunden /// - Option<String>: Die IP-Adresse des Geräts oder None wenn nicht gefunden
pub fn get_ip_from_mac(mac: &str) -> Option<String> { pub fn get_ip_from_mac(mac: &str, network: &str) -> Option<String> {
#[cfg(any(target_os = "linux", target_os = "windows"))] #[cfg(any(target_os = "linux", target_os = "windows"))]
{ {
let output = Command::new("nmap") let output = Command::new("nmap")
.args(["-sn", "-n", "--system-dns", "-PR", "-PS22,80,443,445", "-PA80,443", "-PU161", mac]) .args(["-sn", "-n", "--system-dns", "-PR", network])
.output(); .output();
log("network_utils", &*format!("{:?}", output), LogLevel::Debug);
match output { match output {
Ok(out) => { Ok(out) => {
if !out.status.success() { if !out.status.success() {
@@ -108,13 +111,17 @@ pub fn get_ip_from_mac(mac: &str) -> Option<String> {
} }
let stdout = String::from_utf8_lossy(&out.stdout); let stdout = String::from_utf8_lossy(&out.stdout);
log("network_utils", &*stdout, LogLevel::Debug);
for line in stdout.lines() { for line in stdout.lines() {
if line.contains("Nmap scan report for") { if line.contains(mac) {
if let Some(ip) = line.split_whitespace().last() { if let Some(ip_line) = line.split('\n').find(|l| l.contains("Nmap scan report for")) {
if let Some(ip) = ip_line.split_whitespace().last() {
return Some(ip.to_string()); return Some(ip.to_string());
} }
} }
} }
}
None None
} }
Err(e) => { Err(e) => {