From e239653a44e54bf83d4d907ffda9316068bea96e Mon Sep 17 00:00:00 2001 From: oopsbagel Date: Thu, 17 Jul 2025 15:03:10 -0700 Subject: [PATCH] config: rename display to device Because we toggle some ioctl settings based on this field, change the name to better capture that we're selecting which device we want to load settings for, not just the display module to load. This creates room for future per-device settings without needing more config file fields. --- daemon/src/config.rs | 6 +++--- daemon/src/main.rs | 17 ++++++++--------- dist/config.toml.example | 4 ++-- installer/src/orbic.rs | 2 +- installer/src/tmobile.rs | 2 +- installer/src/tplink.rs | 2 +- installer/src/wingtech.rs | 2 +- 7 files changed, 17 insertions(+), 18 deletions(-) diff --git a/daemon/src/config.rs b/daemon/src/config.rs index e53d467..9bc4809 100644 --- a/daemon/src/config.rs +++ b/daemon/src/config.rs @@ -11,7 +11,7 @@ pub struct Config { pub qmdl_store_path: String, pub port: u16, pub debug_mode: bool, - pub display: Display, + pub device: Device, pub ui_level: u8, pub colorblind_mode: bool, pub key_input_mode: u8, @@ -20,7 +20,7 @@ pub struct Config { #[derive(PartialEq, Debug, Clone, Deserialize, Serialize)] #[serde(rename_all = "lowercase")] -pub enum Display { +pub enum Device { Orbic, Tplink, Tmobile, @@ -33,7 +33,7 @@ impl Default for Config { qmdl_store_path: "/data/rayhunter/qmdl".to_string(), port: 8080, debug_mode: false, - display: Display::Orbic, + device: Device::Orbic, ui_level: 1, colorblind_mode: false, key_input_mode: 0, diff --git a/daemon/src/main.rs b/daemon/src/main.rs index 7c8d965..991160f 100644 --- a/daemon/src/main.rs +++ b/daemon/src/main.rs @@ -13,7 +13,7 @@ use std::net::SocketAddr; use std::sync::Arc; use std::sync::atomic::{AtomicBool, Ordering}; -use crate::config::{Display, parse_args, parse_config}; +use crate::config::{Device, parse_args, parse_config}; use crate::diag::run_diag_read_thread; use crate::error::RayhunterError; use crate::pcap::get_pcap; @@ -215,7 +215,8 @@ async fn run_with_config( if !config.debug_mode { let (ui_shutdown_tx, ui_shutdown_rx) = oneshot::channel(); maybe_ui_shutdown_tx = Some(ui_shutdown_tx); - let mut dev = DiagDevice::new(config.display == Display::Tplink) + info!("Using configuration for device: {0:?}", config.device); + let mut dev = DiagDevice::new(config.device == Device::Tplink) .await .map_err(RayhunterError::DiagInitError)?; dev.config_logs() @@ -234,13 +235,11 @@ async fn run_with_config( ); info!("Starting UI"); - let display = &config.display; - info!("Display type {display:?}"); - let update_ui = match display { - Display::Orbic => display::orbic::update_ui, - Display::Tplink => display::tplink::update_ui, - Display::Tmobile => display::tmobile::update_ui, - Display::Wingtech => display::wingtech::update_ui, + let update_ui = match &config.device { + Device::Orbic => display::orbic::update_ui, + Device::Tplink => display::tplink::update_ui, + Device::Tmobile => display::tmobile::update_ui, + Device::Wingtech => display::wingtech::update_ui, }; update_ui(&task_tracker, &config, ui_shutdown_rx, ui_update_rx); diff --git a/dist/config.toml.example b/dist/config.toml.example index f599db7..d55344c 100644 --- a/dist/config.toml.example +++ b/dist/config.toml.example @@ -3,8 +3,8 @@ qmdl_store_path = "/data/rayhunter/qmdl" port = 8080 debug_mode = false colorblind_mode = false -# Display module, this will be overwritten by the installer. Defaults to "orbic". -#display = "orbic" +# Device selection. This will be overwritten by the installer. Defaults to "orbic". +#device = "orbic" # UI Levels: # # Orbic and TP-Link with color display: diff --git a/installer/src/orbic.rs b/installer/src/orbic.rs index 72c48a0..e8d6af5 100644 --- a/installer/src/orbic.rs +++ b/installer/src/orbic.rs @@ -104,7 +104,7 @@ async fn setup_rayhunter(mut adb_device: ADBUSBDevice) -> Result { &mut adb_device, "/data/rayhunter/config.toml", CONFIG_TOML - .replace("#display = \"orbic\"", "display = \"orbic\"") + .replace("#device = \"orbic\"", "device = \"orbic\"") .as_bytes(), ) .await?; diff --git a/installer/src/tmobile.rs b/installer/src/tmobile.rs index 352fb32..61701b8 100644 --- a/installer/src/tmobile.rs +++ b/installer/src/tmobile.rs @@ -42,7 +42,7 @@ async fn run_install(admin_ip: String, admin_password: String) -> Result<()> { addr, "/data/rayhunter/config.toml", crate::CONFIG_TOML - .replace("#display = \"orbic\"", "display = \"tmobile\"") + .replace("#device = \"orbic\"", "device = \"tmobile\"") .as_bytes(), ) .await?; diff --git a/installer/src/tplink.rs b/installer/src/tplink.rs index cfbc644..4893e1d 100644 --- a/installer/src/tplink.rs +++ b/installer/src/tplink.rs @@ -155,7 +155,7 @@ async fn tplink_run_install( addr, &format!("{sdcard_path}/config.toml"), crate::CONFIG_TOML - .replace("#display = \"orbic\"", "display = \"tplink\"") + .replace("#device = \"orbic\"", "device = \"tplink\"") .as_bytes(), ) .await?; diff --git a/installer/src/wingtech.rs b/installer/src/wingtech.rs index 3d22282..c043ba9 100644 --- a/installer/src/wingtech.rs +++ b/installer/src/wingtech.rs @@ -102,7 +102,7 @@ async fn wingtech_run_install(admin_ip: String, admin_password: String) -> Resul addr, "/data/rayhunter/config.toml", crate::CONFIG_TOML - .replace("#display = \"orbic\"", "display = \"wingtech\"") + .replace("#device = \"orbic\"", "device = \"wingtech\"") .as_bytes(), ) .await?;