+8
-3
@@ -1,6 +1,9 @@
|
|||||||
use crate::{
|
use crate::{
|
||||||
arpparse::NUDState,
|
arpparse::NUDState,
|
||||||
utils::{parse::{de_many, serialize_macs}, query::get_macs},
|
utils::{
|
||||||
|
parse::{de_many, serialize_macs},
|
||||||
|
query::get_macs,
|
||||||
|
},
|
||||||
};
|
};
|
||||||
use axum::{Json, http::StatusCode, response::IntoResponse};
|
use axum::{Json, http::StatusCode, response::IntoResponse};
|
||||||
use axum_extra::extract::Query;
|
use axum_extra::extract::Query;
|
||||||
@@ -96,7 +99,8 @@ pub async fn get_status_json(
|
|||||||
// can we jus collect the whole table instead of doing this.
|
// can we jus collect the whole table instead of doing this.
|
||||||
for d in &dev_opts {
|
for d in &dev_opts {
|
||||||
for n in &nud_opts {
|
for n in &nud_opts {
|
||||||
tasks.push(get_macs( // this i hate sm
|
tasks.push(get_macs(
|
||||||
|
// this i hate sm
|
||||||
name.as_deref(),
|
name.as_deref(),
|
||||||
ips_opt.as_deref(),
|
ips_opt.as_deref(),
|
||||||
d.as_deref(),
|
d.as_deref(),
|
||||||
@@ -110,7 +114,8 @@ pub async fn get_status_json(
|
|||||||
.map(|v| v.into_iter().flatten().collect::<Vec<_>>())
|
.map(|v| v.into_iter().flatten().collect::<Vec<_>>())
|
||||||
{
|
{
|
||||||
Ok(mut table) => {
|
Ok(mut table) => {
|
||||||
if !mac.is_empty() { // mac here
|
if !mac.is_empty() {
|
||||||
|
// mac here
|
||||||
let wanted: HashSet<MacAddr> = mac.into_iter().collect();
|
let wanted: HashSet<MacAddr> = mac.into_iter().collect();
|
||||||
table.retain(|row| row.mac.map(|m| wanted.contains(&m)).unwrap_or(false));
|
table.retain(|row| row.mac.map(|m| wanted.contains(&m)).unwrap_or(false));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -136,7 +136,7 @@ pub async fn get_mac(
|
|||||||
Ok(rows)
|
Ok(rows)
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
/// get macs where you just run ip neigh then rust handles the filtering (faster than get mac)
|
/// get macs where you just run ip neigh then rust handles the filtering (faster than get mac)
|
||||||
pub async fn get_macs_rust(
|
pub async fn get_macs_rust(
|
||||||
machine_names: Option<&str>,
|
machine_names: Option<&str>,
|
||||||
|
|||||||
Reference in New Issue
Block a user