Mirror/rayhunter
1
0
Fork 0
mirror of https://github.com/EFForg/rayhunter.git synced 2026-04-29 17:09:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

diag_device: accept rayhunter::Device arg

Browse Source 
Move daemon's config::Device to lib and toggle the extra tplink ioctl
based on Device::Tplink rather than passing a boolean.
This commit is contained in:
oopsbagel
2025-07-17 15:41:20 -07:00
committed by Will Greenberg
parent e239653a44
commit 29c944af45
4 changed files with 38 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
daemon/src/main.rs
View File

@@ -13,7 +13,7 @@ use std::net::SocketAddr;
use std::sync::Arc;
use std::sync::atomic::{AtomicBool, Ordering};
use crate::config::{Device, parse_args, parse_config};
use crate::config::{parse_args, parse_config};
use crate::diag::run_diag_read_thread;
use crate::error::RayhunterError;
use crate::pcap::get_pcap;
@@ -33,6 +33,7 @@ use diag::{
};
use log::{error, info};
use qmdl_store::RecordingStoreError;
use rayhunter::Device;
use rayhunter::diag_device::DiagDevice;
use tokio::net::TcpListener;
use tokio::select;
@@ -216,7 +217,7 @@ async fn run_with_config(
let (ui_shutdown_tx, ui_shutdown_rx) = oneshot::channel();
maybe_ui_shutdown_tx = Some(ui_shutdown_tx);
info!("Using configuration for device: {0:?}", config.device);
let mut dev = DiagDevice::new(config.device == Device::Tplink)
let mut dev = DiagDevice::new(&config.device)
.await
.map_err(RayhunterError::DiagInitError)?;
dev.config_logs()