Test: Disable adb auth

2026-05-30 09:59:27 -07:00 · 2025-09-02 15:40:45 -04:00
54 changed files with 334 additions and 566 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,11 +1,3 @@
-[alias]
-# Build the daemon with "firmware" profile and "ring" TLS backend.
-# Requires a cross-compiler (see github actions workflows) and is very slow to build.
-build-daemon-firmware = "build -p rayhunter-daemon --bin rayhunter-daemon --target armv7-unknown-linux-musleabihf --profile firmware --no-default-features --features ring-tls"
-# Build the daemon with "firmware-devel" profile and "rustcrypto" backend.
-# Works with just the Rust toolchain, and is medium-slow to build. Binaries are slightly larger.
-build-daemon-firmware-devel = "build -p rayhunter-daemon --bin rayhunter-daemon --target armv7-unknown-linux-musleabihf --profile firmware-devel"
-
 [target.aarch64-apple-darwin]
 linker = "rust-lld"
 rustflags = ["-C", "target-feature=+crt-static"]
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -217,7 +217,7 @@ jobs:
          targets: armv7-unknown-linux-musleabihf
      - uses: Swatinem/rust-cache@v2
      - name: Build rootshell (armv7)
-        run: cargo build -p rootshell --bin rootshell --target armv7-unknown-linux-musleabihf --profile=firmware
+        run: cargo build --bin rootshell --target armv7-unknown-linux-musleabihf --profile=firmware
      - uses: actions/upload-artifact@v4
        with:
          name: rootshell
@@ -225,10 +225,7 @@ jobs:
          if-no-files-found: error

  build_rayhunter:
-    # build_rust_installer needs this step. so when installer_changed, we need
-    # to build this step too. if we skip this step because only the installer
-    # changed, the build_rust_installer step will be skipped too.
-    if: needs.files_changed.outputs.daemon_changed != '0' || needs.files_changed.outputs.installer_changed != '0'
+    if: needs.files_changed.outputs.daemon_changed != '0'
    needs:
      - check_and_test
      - files_changed
@@ -242,8 +239,6 @@ jobs:
        with:
          targets: armv7-unknown-linux-musleabihf
      - uses: Swatinem/rust-cache@v2
-      - name: Install ARM cross-compilation toolchain
-        run: sudo apt-get update && sudo apt-get install -y gcc-arm-linux-gnueabihf
      - name: Build rayhunter-daemon (armv7)
        run: |
          pushd daemon/web
@@ -258,7 +253,7 @@ jobs:
          # what the feature selection in rayhunter-daemon is.
          #
          # https://github.com/rust-lang/cargo/issues/4463
-          CC_armv7_unknown_linux_musleabihf=arm-linux-gnueabihf-gcc cargo build-daemon-firmware
+          cargo build -p rayhunter-daemon --bin rayhunter-daemon --target armv7-unknown-linux-musleabihf --profile=firmware
      - uses: actions/upload-artifact@v4
        with:
          name: rayhunter-daemon
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5,7 +5,7 @@ version = 4
 [[package]]
 name = "adb_client"
 version = "2.1.11"
-source = "git+https://github.com/EFForg/adb_client.git?rev=e511662394e4fa32865c154c40f81a3d846f700c#e511662394e4fa32865c154c40f81a3d846f700c"
+source = "git+https://github.com/EFForg/adb_client.git?rev=208a302367727554d7530e937ca8aee20a74fa51#208a302367727554d7530e937ca8aee20a74fa51"
 dependencies = [
 "async-io",
 "base64",
@@ -22,7 +22,6 @@ dependencies = [
 "nusb",
 "rand 0.9.1",
 "regex",
- "rsa",
 "rusb",
 "rustls-pki-types",
 "serde",
@@ -962,9 +961,9 @@ dependencies = [

 [[package]]
 name = "ed25519-dalek"
-version = "2.2.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70e796c081cee67dc755e1a36a0a172b897fab85fc3f6bc48307991f64e4eca9"
+checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
 dependencies = [
 "curve25519-dalek",
 "ed25519",
@@ -1267,10 +1266,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 dependencies = [
 "cfg-if",
- "js-sys",
 "libc",
 "wasi 0.11.0+wasi-snapshot-preview1",
- "wasm-bindgen",
 ]

 [[package]]
@@ -1280,11 +1277,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
 dependencies = [
 "cfg-if",
- "js-sys",
 "libc",
 "r-efi",
 "wasi 0.14.2+wasi-0.2.4",
- "wasm-bindgen",
 ]

 [[package]]
@@ -1733,7 +1728,7 @@ dependencies = [

 [[package]]
 name = "installer"
-version = "0.7.0"
+version = "0.6.1"
 dependencies = [
 "adb_client",
 "aes",
@@ -1968,12 +1963,6 @@ dependencies = [
 "imgref",
 ]

-[[package]]
-name = "lru-slab"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
-
 [[package]]
 name = "mach2"
 version = "0.4.2"
@@ -2585,61 +2574,6 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"

-[[package]]
-name = "quinn"
-version = "0.11.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8"
-dependencies = [
- "bytes",
- "cfg_aliases",
- "pin-project-lite",
- "quinn-proto",
- "quinn-udp",
- "rustc-hash",
- "rustls",
- "socket2",
- "thiserror 2.0.12",
- "tokio",
- "tracing",
- "web-time",
-]
-
-[[package]]
-name = "quinn-proto"
-version = "0.11.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e"
-dependencies = [
- "bytes",
- "getrandom 0.3.3",
- "lru-slab",
- "rand 0.9.1",
- "ring",
- "rustc-hash",
- "rustls",
- "rustls-pki-types",
- "slab",
- "thiserror 2.0.12",
- "tinyvec",
- "tracing",
- "web-time",
-]
-
-[[package]]
-name = "quinn-udp"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcebb1209ee276352ef14ff8732e24cc2b02bbac986cd74a4c81bcb2f9881970"
-dependencies = [
- "cfg_aliases",
- "libc",
- "once_cell",
- "socket2",
- "tracing",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "quote"
 version = "1.0.40"
@@ -2772,7 +2706,7 @@ dependencies = [

 [[package]]
 name = "rayhunter"
-version = "0.7.0"
+version = "0.6.1"
 dependencies = [
 "bytes",
 "chrono",
@@ -2794,7 +2728,7 @@ dependencies = [

 [[package]]
 name = "rayhunter-check"
-version = "0.7.0"
+version = "0.6.1"
 dependencies = [
 "clap",
 "futures",
@@ -2808,7 +2742,7 @@ dependencies = [

 [[package]]
 name = "rayhunter-daemon"
-version = "0.7.0"
+version = "0.6.1"
 dependencies = [
 "anyhow",
 "async-trait",
@@ -2903,7 +2837,6 @@ dependencies = [
 "log",
 "percent-encoding",
 "pin-project-lite",
- "quinn",
 "rustls",
 "rustls-pki-types",
 "serde",
@@ -2954,7 +2887,7 @@ dependencies = [

 [[package]]
 name = "rootshell"
-version = "0.7.0"
+version = "0.6.1"
 dependencies = [
 "nix",
 ]
@@ -2996,12 +2929,6 @@ version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"

-[[package]]
-name = "rustc-hash"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
-
 [[package]]
 name = "rustc_version"
 version = "0.4.1"
@@ -3044,7 +2971,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7160e3e10bf4535308537f3c4e1641468cd0e485175d6163087c0393c7d46643"
 dependencies = [
 "once_cell",
- "ring",
 "rustls-pki-types",
 "rustls-webpki 0.103.3",
 "subtle",
@@ -3057,7 +2983,6 @@ version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
 dependencies = [
- "web-time",
 "zeroize",
 ]

@@ -3156,9 +3081,9 @@ dependencies = [

 [[package]]
 name = "semver"
-version = "1.0.27"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
+checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"

 [[package]]
 name = "serde"
@@ -3439,7 +3364,7 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"

 [[package]]
 name = "telcom-parser"
-version = "0.7.0"
+version = "0.6.1"
 dependencies = [
 "asn1-codecs",
 "asn1-compiler",
@@ -3566,21 +3491,6 @@ dependencies = [
 "zerovec",
 ]

-[[package]]
-name = "tinyvec"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
 [[package]]
 name = "tokio"
 version = "1.45.0"
@@ -3978,16 +3888,6 @@ dependencies = [
 "wasm-bindgen",
 ]

-[[package]]
-name = "web-time"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "webpki-roots"
 version = "1.0.0"
--- a/check/Cargo.toml
+++ b/check/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rayhunter-check"
-version = "0.7.0"
+version = "0.6.1"
 edition = "2024"

 [dependencies]
--- a/daemon/Cargo.toml
+++ b/daemon/Cargo.toml
@@ -1,14 +1,9 @@
 [package]
 name = "rayhunter-daemon"
-version = "0.7.0"
+version = "0.6.1"
 edition = "2024"
 rust-version = "1.88.0"

-[features]
-default = ["rustcrypto-tls"]
-rustcrypto-tls = ["reqwest/rustls-tls-webpki-roots-no-provider", "dep:rustls-rustcrypto"]
-ring-tls = ["reqwest/rustls-tls-webpki-roots"]
-
 [dependencies]
 rayhunter = { path = "../lib" }
 toml = "0.8.8"
@@ -30,6 +25,8 @@ image = { version =  "0.25.1", default-features = false, features = ["png", "gif
 tempfile = "3.10.1"
 async_zip = { version = "0.0.17", features = ["tokio"] }
 anyhow = "1.0.98"
-reqwest = { version = "0.12.20", default-features = false }
-rustls-rustcrypto = { version = "0.0.2-alpha", optional = true }
+reqwest = { version = "0.12.20", default-features = false, features = [
+    "rustls-tls-webpki-roots-no-provider",
+] }
+rustls-rustcrypto = "0.0.2-alpha"
 async-trait = "0.1.88"
--- a/daemon/src/battery/mod.rs
+++ b/daemon/src/battery/mod.rs
@@ -1,22 +1,14 @@
-use std::{path::Path, time::Duration};
+use std::path::Path;

-use log::{error, info};
 use rayhunter::Device;
 use serde::Serialize;
-use tokio::select;
-use tokio_util::{sync::CancellationToken, task::TaskTracker};

-use crate::{
-    error::RayhunterError,
-    notifications::{Notification, NotificationType},
-};
+use crate::error::RayhunterError;

 pub mod orbic;
 pub mod tmobile;
 pub mod wingtech;

-const LOW_BATTERY_LEVEL: u8 = 10;
-
 #[derive(Clone, Copy, PartialEq, Debug, Serialize)]
 pub struct BatteryState {
    level: u8,
@@ -53,59 +45,3 @@ pub async fn get_battery_status(device: &Device) -> Result<BatteryState, Rayhunt
        _ => return Err(RayhunterError::FunctionNotSupportedForDeviceError),
    })
 }
-
-pub fn run_battery_notification_worker(
-    task_tracker: &TaskTracker,
-    device: Device,
-    notification_channel: tokio::sync::mpsc::Sender<Notification>,
-    shutdown_token: CancellationToken,
-) {
-    task_tracker.spawn(async move {
-        // Don't send a notification initially if the device starts at a low battery level.
-        let mut triggered = match get_battery_status(&device).await {
-            Err(RayhunterError::FunctionNotSupportedForDeviceError) => {
-                info!("Battery level function not supported for device");
-                false
-            }
-            Err(e) => {
-                error!("Failed to get battery status: {e}");
-                true
-            }
-            Ok(status) => status.level <= LOW_BATTERY_LEVEL,
-        };
-
-        loop {
-            select! {
-                _ = shutdown_token.cancelled() => break,
-                _ = tokio::time::sleep(Duration::from_secs(15)) => {}
-            }
-
-            let status = match get_battery_status(&device).await {
-                Err(e) => {
-                    error!("Failed to get battery status: {e}");
-                    continue;
-                }
-                Ok(status) => status,
-            };
-
-            // To avoid flapping, if the notification has already been triggered
-            // wait until the device has been plugged in and the battery level
-            // is high enough to re-enable notifications.
-            if triggered && status.is_plugged_in && status.level > LOW_BATTERY_LEVEL {
-                triggered = false;
-                continue;
-            }
-            if !triggered && !status.is_plugged_in && status.level <= LOW_BATTERY_LEVEL {
-                notification_channel
-                    .send(Notification::new(
-                        NotificationType::LowBattery,
-                        "Rayhunter's battery is low".to_string(),
-                        None,
-                    ))
-                    .await
-                    .expect("Failed to send to notification channel");
-                triggered = true;
-            }
-        }
-    });
-}
--- a/daemon/src/config.rs
+++ b/daemon/src/config.rs
@@ -5,7 +5,6 @@ use rayhunter::Device;
 use rayhunter::analysis::analyzer::AnalyzerConfig;

 use crate::error::RayhunterError;
-use crate::notifications::NotificationType;

 #[derive(Debug, Clone, Deserialize, Serialize)]
 #[serde(default)]
@@ -18,7 +17,6 @@ pub struct Config {
    pub colorblind_mode: bool,
    pub key_input_mode: u8,
    pub ntfy_url: Option<String>,
-    pub enabled_notifications: Vec<NotificationType>,
    pub analyzers: AnalyzerConfig,
 }

@@ -34,7 +32,6 @@ impl Default for Config {
            key_input_mode: 0,
            analyzers: AnalyzerConfig::default(),
            ntfy_url: None,
-            enabled_notifications: vec![NotificationType::Warning, NotificationType::LowBattery],
        }
    }
 }
--- a/daemon/src/diag.rs
+++ b/daemon/src/diag.rs
@@ -24,7 +24,7 @@ use rayhunter::qmdl::QmdlWriter;

 use crate::analysis::{AnalysisCtrlMessage, AnalysisWriter};
 use crate::display;
-use crate::notifications::{Notification, NotificationType};
+use crate::notifications::Notification;
 use crate::qmdl_store::{RecordingStore, RecordingStoreError};
 use crate::server::ServerState;

@@ -207,7 +207,7 @@ impl DiagTask {
                info!("a heuristic triggered on this run!");
                self.notification_channel
                    .send(Notification::new(
-                        NotificationType::Warning,
+                        "heuristic-warning".to_string(),
                        format!("Rayhunter has detected a {:?} severity event", max_type),
                        Some(Duration::from_secs(60 * 5)),
                    ))
--- a/daemon/src/display/generic_framebuffer.rs
+++ b/daemon/src/display/generic_framebuffer.rs
@@ -9,7 +9,9 @@ use rayhunter::analysis::analyzer::EventType;

 use log::{error, info};
 use tokio::sync::mpsc::Receiver;
-use tokio_util::{sync::CancellationToken, task::TaskTracker};
+use tokio::sync::oneshot;
+use tokio::sync::oneshot::error::TryRecvError;
+use tokio_util::task::TaskTracker;

 use include_dir::{Dir, include_dir};

@@ -171,7 +173,7 @@ pub fn update_ui(
    task_tracker: &TaskTracker,
    config: &config::Config,
    mut fb: impl GenericFramebuffer,
-    shutdown_token: CancellationToken,
+    mut ui_shutdown_rx: oneshot::Receiver<()>,
    mut ui_update_rx: Receiver<DisplayState>,
 ) {
    static IMAGE_DIR: Dir<'_> = include_dir!("$CARGO_MANIFEST_DIR/images/");
@@ -202,9 +204,13 @@ pub fn update_ui(
            );
        }
        loop {
-            if shutdown_token.is_cancelled() {
-                info!("received UI shutdown");
-                break;
+            match ui_shutdown_rx.try_recv() {
+                Ok(_) => {
+                    info!("received UI shutdown");
+                    break;
+                }
+                Err(TryRecvError::Empty) => {}
+                Err(e) => panic!("error receiving shutdown message: {e}"),
            }
            match ui_update_rx.try_recv() {
                Ok(state) => {
--- a/daemon/src/display/headless.rs
+++ b/daemon/src/display/headless.rs
@@ -1,6 +1,6 @@
 use log::info;
 use tokio::sync::mpsc::Receiver;
-use tokio_util::sync::CancellationToken;
+use tokio::sync::oneshot;
 use tokio_util::task::TaskTracker;

 use crate::config;
@@ -9,7 +9,7 @@ use crate::display::DisplayState;
 pub fn update_ui(
    _task_tracker: &TaskTracker,
    _config: &config::Config,
-    _shutdown_token: CancellationToken,
+    _ui_shutdown_rx: oneshot::Receiver<()>,
    _ui_update_rx: Receiver<DisplayState>,
 ) {
    info!("Headless mode, not spawning UI.");
--- a/daemon/src/display/orbic.rs
+++ b/daemon/src/display/orbic.rs
@@ -4,7 +4,7 @@ use crate::display::generic_framebuffer::{self, Dimensions, GenericFramebuffer};
 use async_trait::async_trait;

 use tokio::sync::mpsc::Receiver;
-use tokio_util::sync::CancellationToken;
+use tokio::sync::oneshot;
 use tokio_util::task::TaskTracker;

 const FB_PATH: &str = "/dev/fb0";
@@ -38,14 +38,14 @@ impl GenericFramebuffer for Framebuffer {
 pub fn update_ui(
    task_tracker: &TaskTracker,
    config: &config::Config,
-    shutdown_token: CancellationToken,
+    ui_shutdown_rx: oneshot::Receiver<()>,
    ui_update_rx: Receiver<DisplayState>,
 ) {
    generic_framebuffer::update_ui(
        task_tracker,
        config,
        Framebuffer,
-        shutdown_token,
+        ui_shutdown_rx,
        ui_update_rx,
    )
 }
--- a/daemon/src/display/tmobile.rs
+++ b/daemon/src/display/tmobile.rs
@@ -4,7 +4,7 @@
 /// DisplayState::WarningDetected { .. } => Signal LED slowly blinks red.
 use log::{error, info};
 use tokio::sync::mpsc;
-use tokio_util::sync::CancellationToken;
+use tokio::sync::oneshot;
 use tokio_util::task::TaskTracker;

 use std::time::Duration;
@@ -27,7 +27,7 @@ async fn stop_blinking(path: String) {
 pub fn update_ui(
    task_tracker: &TaskTracker,
    config: &config::Config,
-    shutdown_token: CancellationToken,
+    mut ui_shutdown_rx: oneshot::Receiver<()>,
    mut ui_update_rx: mpsc::Receiver<DisplayState>,
 ) {
    let mut invisible: bool = false;
@@ -40,9 +40,13 @@ pub fn update_ui(
        let mut last_state = DisplayState::Paused;

        loop {
-            if shutdown_token.is_cancelled() {
-                info!("received UI shutdown");
-                break;
+            match ui_shutdown_rx.try_recv() {
+                Ok(_) => {
+                    info!("received UI shutdown");
+                    break;
+                }
+                Err(oneshot::error::TryRecvError::Empty) => {}
+                Err(e) => panic!("error receiving shutdown message: {e}"),
            }
            match ui_update_rx.try_recv() {
                Ok(new_state) => state = new_state,
--- a/daemon/src/display/tplink.rs
+++ b/daemon/src/display/tplink.rs
@@ -1,6 +1,6 @@
 use log::info;
 use tokio::sync::mpsc::Receiver;
-use tokio_util::sync::CancellationToken;
+use tokio::sync::oneshot;
 use tokio_util::task::TaskTracker;

 use crate::config;
@@ -11,7 +11,7 @@ use std::fs;
 pub fn update_ui(
    task_tracker: &TaskTracker,
    config: &config::Config,
-    shutdown_token: CancellationToken,
+    ui_shutdown_rx: oneshot::Receiver<()>,
    ui_update_rx: Receiver<DisplayState>,
 ) {
    let display_level = config.ui_level;
@@ -23,9 +23,9 @@ pub fn update_ui(
    // The alternative would be to make the entire initialization async
    if fs::exists(tplink_onebit::OLED_PATH).unwrap_or_default() {
        info!("detected one-bit display");
-        tplink_onebit::update_ui(task_tracker, config, shutdown_token, ui_update_rx)
+        tplink_onebit::update_ui(task_tracker, config, ui_shutdown_rx, ui_update_rx)
    } else {
        info!("fallback to framebuffer");
-        tplink_framebuffer::update_ui(task_tracker, config, shutdown_token, ui_update_rx)
+        tplink_framebuffer::update_ui(task_tracker, config, ui_shutdown_rx, ui_update_rx)
    }
 }
--- a/daemon/src/display/tplink_framebuffer.rs
+++ b/daemon/src/display/tplink_framebuffer.rs
@@ -2,13 +2,13 @@ use async_trait::async_trait;
 use std::os::fd::AsRawFd;
 use tokio::fs::OpenOptions;
 use tokio::io::AsyncWriteExt;
-use tokio_util::sync::CancellationToken;

 use crate::config;
 use crate::display::DisplayState;
 use crate::display::generic_framebuffer::{self, Dimensions, GenericFramebuffer};

 use tokio::sync::mpsc::Receiver;
+use tokio::sync::oneshot;
 use tokio_util::task::TaskTracker;

 const FB_PATH: &str = "/dev/fb0";
@@ -80,14 +80,14 @@ impl GenericFramebuffer for Framebuffer {
 pub fn update_ui(
    task_tracker: &TaskTracker,
    config: &config::Config,
-    shutdown_token: CancellationToken,
+    ui_shutdown_rx: oneshot::Receiver<()>,
    ui_update_rx: Receiver<DisplayState>,
 ) {
    generic_framebuffer::update_ui(
        task_tracker,
        config,
        Framebuffer,
-        shutdown_token,
+        ui_shutdown_rx,
        ui_update_rx,
    )
 }
--- a/daemon/src/display/tplink_onebit.rs
+++ b/daemon/src/display/tplink_onebit.rs
@@ -6,7 +6,8 @@ use crate::display::DisplayState;

 use log::{error, info};
 use tokio::sync::mpsc::Receiver;
-use tokio_util::sync::CancellationToken;
+use tokio::sync::oneshot;
+use tokio::sync::oneshot::error::TryRecvError;
 use tokio_util::task::TaskTracker;

 use std::time::Duration;
@@ -111,7 +112,7 @@ const STATUS_WARNING: &[u8] = pixelart! {
 pub fn update_ui(
    task_tracker: &TaskTracker,
    config: &config::Config,
-    shutdown_token: CancellationToken,
+    mut ui_shutdown_rx: oneshot::Receiver<()>,
    mut ui_update_rx: Receiver<DisplayState>,
 ) {
    let display_level = config.ui_level;
@@ -123,9 +124,13 @@ pub fn update_ui(
        let mut pixels = STATUS_SMILING;

        loop {
-            if shutdown_token.is_cancelled() {
-                info!("received UI shutdown");
-                break;
+            match ui_shutdown_rx.try_recv() {
+                Ok(_) => {
+                    info!("received UI shutdown");
+                    break;
+                }
+                Err(TryRecvError::Empty) => {}
+                Err(e) => panic!("error receiving shutdown message: {e}"),
            }

            match ui_update_rx.try_recv() {
--- a/daemon/src/display/uz801.rs
+++ b/daemon/src/display/uz801.rs
@@ -4,7 +4,7 @@
 /// DisplayState::WarningDetected => Signal LED is solid red.
 use log::{error, info};
 use tokio::sync::mpsc;
-use tokio_util::sync::CancellationToken;
+use tokio::sync::oneshot;
 use tokio_util::task::TaskTracker;

 use std::time::Duration;
@@ -27,7 +27,7 @@ async fn led_off(path: String) {
 pub fn update_ui(
    task_tracker: &TaskTracker,
    config: &config::Config,
-    shutdown_token: CancellationToken,
+    mut ui_shutdown_rx: oneshot::Receiver<()>,
    mut ui_update_rx: mpsc::Receiver<DisplayState>,
 ) {
    let mut invisible: bool = false;
@@ -41,9 +41,13 @@ pub fn update_ui(
        let mut last_update = std::time::Instant::now();

        loop {
-            if shutdown_token.is_cancelled() {
-                info!("received UI shutdown");
-                break;
+            match ui_shutdown_rx.try_recv() {
+                Ok(_) => {
+                    info!("received UI shutdown");
+                    break;
+                }
+                Err(oneshot::error::TryRecvError::Empty) => {}
+                Err(e) => panic!("error receiving shutdown message: {e}"),
            }
            match ui_update_rx.try_recv() {
                Ok(new_state) => state = new_state,
--- a/daemon/src/display/wingtech.rs
+++ b/daemon/src/display/wingtech.rs
@@ -10,7 +10,7 @@ use crate::display::generic_framebuffer::{self, Dimensions, GenericFramebuffer};
 use async_trait::async_trait;

 use tokio::sync::mpsc::Receiver;
-use tokio_util::sync::CancellationToken;
+use tokio::sync::oneshot;
 use tokio_util::task::TaskTracker;

 const FB_PATH: &str = "/dev/fb0";
@@ -43,14 +43,14 @@ impl GenericFramebuffer for Framebuffer {
 pub fn update_ui(
    task_tracker: &TaskTracker,
    config: &config::Config,
-    shutdown_token: CancellationToken,
+    ui_shutdown_rx: oneshot::Receiver<()>,
    ui_update_rx: Receiver<DisplayState>,
 ) {
    generic_framebuffer::update_ui(
        task_tracker,
        config,
        Framebuffer,
-        shutdown_token,
+        ui_shutdown_rx,
        ui_update_rx,
    )
 }
--- a/daemon/src/key_input.rs
+++ b/daemon/src/key_input.rs
@@ -3,7 +3,7 @@ use std::time::{Duration, Instant};
 use tokio::fs::File;
 use tokio::io::AsyncReadExt;
 use tokio::sync::mpsc::Sender;
-use tokio_util::sync::CancellationToken;
+use tokio::sync::oneshot;
 use tokio_util::task::TaskTracker;

 use crate::config;
@@ -21,7 +21,7 @@ pub fn run_key_input_thread(
    task_tracker: &TaskTracker,
    config: &config::Config,
    diag_tx: Sender<DiagDeviceCtrlMessage>,
-    cancellation_token: CancellationToken,
+    mut ui_shutdown_rx: oneshot::Receiver<()>,
 ) {
    if config.key_input_mode == 0 {
        return;
@@ -43,7 +43,7 @@ pub fn run_key_input_thread(

        loop {
            tokio::select! {
-               _ = cancellation_token.cancelled() => {
+                _ = &mut ui_shutdown_rx => {
                    info!("received key input shutdown");
                    return;
                }
--- a/daemon/src/main.rs
+++ b/daemon/src/main.rs
@@ -13,8 +13,8 @@ mod stats;

 use std::net::SocketAddr;
 use std::sync::Arc;
+use std::sync::atomic::{AtomicBool, Ordering};

-use crate::battery::run_battery_notification_worker;
 use crate::config::{parse_args, parse_config};
 use crate::diag::run_diag_read_thread;
 use crate::error::RayhunterError;
@@ -43,10 +43,9 @@ use rayhunter::diag_device::DiagDevice;
 use stats::get_log;
 use tokio::net::TcpListener;
 use tokio::select;
-use tokio::sync::RwLock;
 use tokio::sync::mpsc::{self, Sender};
+use tokio::sync::{RwLock, oneshot};
 use tokio::task::JoinHandle;
-use tokio_util::sync::CancellationToken;
 use tokio_util::task::TaskTracker;

 type AppRouter = Router<Arc<ServerState>>;
@@ -79,7 +78,7 @@ fn get_router() -> AppRouter {
 async fn run_server(
    task_tracker: &TaskTracker,
    state: Arc<ServerState>,
-    shutdown_token: CancellationToken,
+    server_shutdown_rx: oneshot::Receiver<()>,
 ) -> JoinHandle<()> {
    info!("spinning up server");
    let addr = SocketAddr::from(([0, 0, 0, 0], state.config.port));
@@ -89,12 +88,17 @@ async fn run_server(
    task_tracker.spawn(async move {
        info!("The orca is hunting for stingrays...");
        axum::serve(listener, app)
-            .with_graceful_shutdown(shutdown_token.cancelled_owned())
+            .with_graceful_shutdown(server_shutdown_signal(server_shutdown_rx))
            .await
            .unwrap();
    })
 }

+async fn server_shutdown_signal(server_shutdown_rx: oneshot::Receiver<()>) {
+    server_shutdown_rx.await.unwrap();
+    info!("Server received shutdown signal, exiting...");
+}
+
 // Loads a RecordingStore if one exists, and if not, only create one if we're
 // not in debug mode. If we fail to parse the manifest AND we're not in debug
 // mode, try to recover the manifest from the existing QMDL files
@@ -126,10 +130,15 @@ async fn init_qmdl_store(config: &config::Config) -> Result<RecordingStore, Rayh
 // Start a thread that'll track when user hits ctrl+c. When that happens,
 // trigger various cleanup tasks, including sending signals to other threads to
 // shutdown
+#[allow(clippy::too_many_arguments)]
 fn run_shutdown_thread(
    task_tracker: &TaskTracker,
    diag_device_sender: Sender<DiagDeviceCtrlMessage>,
-    shutdown_token: CancellationToken,
+    daemon_restart_rx: oneshot::Receiver<()>,
+    should_restart_flag: Arc<AtomicBool>,
+    server_shutdown_tx: oneshot::Sender<()>,
+    maybe_ui_shutdown_tx: Option<oneshot::Sender<()>>,
+    maybe_key_input_shutdown_tx: Option<oneshot::Sender<()>>,
    qmdl_store_lock: Arc<RwLock<RecordingStore>>,
    analysis_tx: Sender<AnalysisCtrlMessage>,
 ) -> JoinHandle<Result<(), RayhunterError>> {
@@ -141,9 +150,17 @@ fn run_shutdown_thread(
                if let Err(err) = res {
                    error!("Unable to listen for shutdown signal: {err}");
                }
+
+                should_restart_flag.store(false, Ordering::Relaxed);
            }
-            _ = shutdown_token.cancelled() => {}
-        }
+            res = daemon_restart_rx => {
+                if let Err(err) = res {
+                    error!("Unable to listen for shutdown signal: {err}");
+                }
+
+                should_restart_flag.store(true, Ordering::Relaxed);
+            }
+        };

        let mut qmdl_store = qmdl_store_lock.write().await;
        if qmdl_store.current_entry.is_some() {
@@ -152,7 +169,15 @@ fn run_shutdown_thread(
            info!("Done!");
        }

-        shutdown_token.cancel();
+        server_shutdown_tx
+            .send(())
+            .expect("couldn't send server shutdown signal");
+        if let Some(ui_shutdown_tx) = maybe_ui_shutdown_tx {
+            let _ = ui_shutdown_tx.send(());
+        }
+        if let Some(key_input_shutdown_tx) = maybe_key_input_shutdown_tx {
+            let _ = key_input_shutdown_tx.send(());
+        }
        diag_device_sender
            .send(DiagDeviceCtrlMessage::Exit)
            .await
@@ -169,12 +194,9 @@ fn run_shutdown_thread(
 async fn main() -> Result<(), RayhunterError> {
    env_logger::init();

-    #[cfg(feature = "rustcrypto-tls")]
-    {
-        rustls_rustcrypto::provider()
-            .install_default()
-            .expect("Couldn't install rustcrypto provider");
-    }
+    rustls_rustcrypto::provider()
+        .install_default()
+        .expect("Couldn't install rustcrypto provider");

    let args = parse_args();

@@ -201,12 +223,14 @@ async fn run_with_config(
    let (diag_tx, diag_rx) = mpsc::channel::<DiagDeviceCtrlMessage>(1);
    let (ui_update_tx, ui_update_rx) = mpsc::channel::<display::DisplayState>(1);
    let (analysis_tx, analysis_rx) = mpsc::channel::<AnalysisCtrlMessage>(5);
-    let restart_token = CancellationToken::new();
-    let shutdown_token = restart_token.child_token();
+    let mut maybe_ui_shutdown_tx = None;
+    let mut maybe_key_input_shutdown_tx = None;

    let notification_service = NotificationService::new(config.ntfy_url.clone());

    if !config.debug_mode {
+        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)
            .await
@@ -237,17 +261,21 @@ async fn run_with_config(
            Device::Pinephone => display::headless::update_ui,
            Device::Uz801 => display::uz801::update_ui,
        };
-        update_ui(&task_tracker, &config, shutdown_token.clone(), ui_update_rx);
+        update_ui(&task_tracker, &config, ui_shutdown_rx, ui_update_rx);

        info!("Starting Key Input service");
+        let (key_input_shutdown_tx, key_input_shutdown_rx) = oneshot::channel();
+        maybe_key_input_shutdown_tx = Some(key_input_shutdown_tx);
        key_input::run_key_input_thread(
            &task_tracker,
            &config,
            diag_tx.clone(),
-            shutdown_token.clone(),
+            key_input_shutdown_rx,
        );
    }

+    let (daemon_restart_tx, daemon_restart_rx) = oneshot::channel::<()>();
+    let (server_shutdown_tx, server_shutdown_rx) = oneshot::channel::<()>();
    let analysis_status_lock = Arc::new(RwLock::new(analysis_status));
    run_analysis_thread(
        &task_tracker,
@@ -256,28 +284,20 @@ async fn run_with_config(
        analysis_status_lock.clone(),
        config.analyzers.clone(),
    );
+    let should_restart_flag = Arc::new(AtomicBool::new(false));

    run_shutdown_thread(
        &task_tracker,
        diag_tx.clone(),
-        shutdown_token.clone(),
+        daemon_restart_rx,
+        should_restart_flag.clone(),
+        server_shutdown_tx,
+        maybe_ui_shutdown_tx,
+        maybe_key_input_shutdown_tx,
        qmdl_store_lock.clone(),
        analysis_tx.clone(),
    );
-
-    run_battery_notification_worker(
-        &task_tracker,
-        config.device.clone(),
-        notification_service.new_handler(),
-        shutdown_token.clone(),
-    );
-
-    run_notification_worker(
-        &task_tracker,
-        notification_service,
-        config.enabled_notifications.clone(),
-    );
-
+    run_notification_worker(&task_tracker, notification_service);
    let state = Arc::new(ServerState {
        config_path: args.config_path.clone(),
        config,
@@ -285,16 +305,16 @@ async fn run_with_config(
        diag_device_ctrl_sender: diag_tx,
        analysis_status_lock,
        analysis_sender: analysis_tx,
-        daemon_restart_token: restart_token.clone(),
+        daemon_restart_tx: Arc::new(RwLock::new(Some(daemon_restart_tx))),
        ui_update_sender: Some(ui_update_tx),
    });
-    run_server(&task_tracker, state, shutdown_token.clone()).await;
+    run_server(&task_tracker, state, server_shutdown_rx).await;

    task_tracker.close();
    task_tracker.wait().await;

    info!("see you space cowboy...");
-    Ok(restart_token.is_cancelled())
+    Ok(should_restart_flag.load(Ordering::Relaxed))
 }

 #[cfg(test)]
--- a/daemon/src/notifications.rs
+++ b/daemon/src/notifications.rs
@@ -5,30 +5,19 @@ use std::{
 };

 use log::error;
-use serde::{Deserialize, Serialize};
 use tokio::sync::mpsc::{self, error::TryRecvError};
 use tokio_util::task::TaskTracker;

-#[derive(Hash, Eq, PartialEq, Debug, Clone, Serialize, Deserialize)]
-pub enum NotificationType {
-    Warning,
-    LowBattery,
-}
-
 pub struct Notification {
-    notification_type: NotificationType,
+    message_type: String,
    message: String,
    debounce: Option<Duration>,
 }

 impl Notification {
-    pub fn new(
-        notification_type: NotificationType,
-        message: String,
-        debounce: Option<Duration>,
-    ) -> Self {
+    pub fn new(message_type: String, message: String, debounce: Option<Duration>) -> Self {
        Notification {
-            notification_type,
+            message_type,
            message,
            debounce,
        }
@@ -63,7 +52,6 @@ impl NotificationService {
 pub fn run_notification_worker(
    task_tracker: &TaskTracker,
    mut notification_service: NotificationService,
-    enabled_notifications: Vec<NotificationType>,
 ) {
    task_tracker.spawn(async move {
        if let Some(url) = notification_service.url
@@ -77,12 +65,8 @@ pub fn run_notification_worker(
                loop {
                    match notification_service.rx.try_recv() {
                        Ok(notification) => {
-                            if !enabled_notifications.contains(&notification.notification_type) {
-                                continue;
-                            }
-
                            let status = notification_statuses
-                                .entry(notification.notification_type)
+                                .entry(notification.message_type)
                                .or_insert_with(|| NotificationStatus {
                                    message: "".to_string(),
                                    needs_sending: true,
--- a/daemon/src/server.rs
+++ b/daemon/src/server.rs
@@ -13,11 +13,10 @@ use log::{error, warn};
 use std::sync::Arc;
 use tokio::fs::write;
 use tokio::io::{AsyncReadExt, copy, duplex};
-use tokio::sync::RwLock;
 use tokio::sync::mpsc::Sender;
+use tokio::sync::{RwLock, oneshot};
 use tokio_util::compat::FuturesAsyncWriteCompatExt;
 use tokio_util::io::ReaderStream;
-use tokio_util::sync::CancellationToken;

 use crate::DiagDeviceCtrlMessage;
 use crate::analysis::{AnalysisCtrlMessage, AnalysisStatus};
@@ -33,7 +32,7 @@ pub struct ServerState {
    pub diag_device_ctrl_sender: Sender<DiagDeviceCtrlMessage>,
    pub analysis_status_lock: Arc<RwLock<AnalysisStatus>>,
    pub analysis_sender: Sender<AnalysisCtrlMessage>,
-    pub daemon_restart_token: CancellationToken,
+    pub daemon_restart_tx: Arc<RwLock<Option<oneshot::Sender<()>>>>,
    pub ui_update_sender: Option<Sender<DisplayState>>,
 }

@@ -74,6 +73,11 @@ pub async fn serve_static(
    let path = path.trim_start_matches('/');

    match path {
+        "rayhunter_icon.png" => (
+            [(header::CONTENT_TYPE, HeaderValue::from_static("image/png"))],
+            include_bytes!("../web/build/rayhunter_icon.png"),
+        )
+            .into_response(),
        "rayhunter_orca_only.png" => (
            [(header::CONTENT_TYPE, HeaderValue::from_static("image/png"))],
            include_bytes!("../web/build/rayhunter_orca_only.png"),
@@ -129,11 +133,24 @@ pub async fn set_config(
    })?;

    // Trigger daemon restart after writing config
-    state.daemon_restart_token.cancel();
-    Ok((
-        StatusCode::ACCEPTED,
-        "wrote config and triggered restart".to_string(),
-    ))
+    let mut restart_tx = state.daemon_restart_tx.write().await;
+    if let Some(sender) = restart_tx.take() {
+        sender.send(()).map_err(|_| {
+            (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                "couldn't send restart signal".to_string(),
+            )
+        })?;
+        Ok((
+            StatusCode::ACCEPTED,
+            "wrote config and triggered restart".to_string(),
+        ))
+    } else {
+        Ok((
+            StatusCode::ACCEPTED,
+            "wrote config but restart already triggered".to_string(),
+        ))
+    }
 }

 pub async fn get_zip(
@@ -314,7 +331,7 @@ mod tests {
            diag_device_ctrl_sender: tx,
            analysis_status_lock: Arc::new(RwLock::new(analysis_status)),
            analysis_sender: analysis_tx,
-            daemon_restart_token: CancellationToken::new(),
+            daemon_restart_tx: Arc::new(RwLock::new(None)),
            ui_update_sender: None,
        })
    }
--- a/daemon/web/src/lib/components/AnalysisTable.svelte
+++ b/daemon/web/src/lib/components/AnalysisTable.svelte
@@ -33,7 +33,7 @@
    {#if report.statistics.num_warnings === 0 && report.statistics.num_informational_logs === 0}
        <p>Nothing to show!</p>
    {:else}
-        <div class="overflow-x-auto">
+        <div class="overflow-x-scroll">
            <table class="table-auto text-left">
                <thead class="p-2">
                    <tr class="bg-gray-300">
@@ -77,10 +77,10 @@
    <div>
        <p class="text-lg underline">Unparsed Messages</p>
        <p>
-            These are due to a limitation or bug in Rayhunter's parser, and aren't usually a
+            These are due to a limitation or bug in Rayhunter's parser, and aren't ususally a
            problem.
        </p>
-        <div class="overflow-x-auto">
+        <div class="overflow-x-scroll">
            <table class="table-auto text-left">
                <thead class="p-2">
                    <tr class="bg-gray-300">
--- a/daemon/web/src/lib/components/ConfigForm.svelte
+++ b/daemon/web/src/lib/components/ConfigForm.svelte
@@ -111,6 +111,18 @@
                    </select>
                </div>

+                <div>
+                    <label for="ntfy_url" class="block text-sm font-medium text-gray-700 mb-1">
+                        ntfy URL for Sending Notifications
+                    </label>
+                    <input
+                        id="ntfy_url"
+                        type="url"
+                        bind:value={config.ntfy_url}
+                        class="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-rayhunter-blue"
+                    />
+                </div>
+
                <div class="space-y-3">
                    <div class="flex items-center">
                        <input
@@ -125,56 +137,6 @@
                    </div>
                </div>

-                <div class="border-t pt-4 mt-6 space-y-3">
-                    <h3 class="text-lg font-semibold text-gray-800 mb-4">Notification Settings</h3>
-                    <div>
-                        <label for="ntfy_url" class="block text-sm font-medium text-gray-700 mb-1">
-                            ntfy URL for Sending Notifications (if unset you will not receive
-                            notifications)
-                        </label>
-                        <input
-                            id="ntfy_url"
-                            type="url"
-                            bind:value={config.ntfy_url}
-                            class="w-full px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-rayhunter-blue"
-                        />
-                    </div>
-
-                    <div class="space-y-2">
-                        <div class="block text-sm font-medium text-gray-700 mb-1">
-                            Enabled Notification Types
-                        </div>
-                        <div class="flex items-center">
-                            <input
-                                type="checkbox"
-                                id="enable_warning_notifications"
-                                value="Warning"
-                                bind:group={config.enabled_notifications}
-                            />
-                            <label
-                                for="enable_warning_notifications"
-                                class="ml-2 block text-sm text-gray-700"
-                            >
-                                Warnings
-                            </label>
-                        </div>
-                        <div class="flex items-center">
-                            <input
-                                type="checkbox"
-                                id="enable_lowbattery_notifications"
-                                value="LowBattery"
-                                bind:group={config.enabled_notifications}
-                            />
-                            <label
-                                for="enable_lowbattery_notifications"
-                                class="ml-2 block text-sm text-gray-700"
-                            >
-                                Low Battery
-                            </label>
-                        </div>
-                    </div>
-                </div>
-
                <div class="border-t pt-4 mt-6">
                    <h3 class="text-lg font-semibold text-gray-800 mb-4">
                        Analyzer Heuristic Settings
--- a/daemon/web/src/lib/components/ManifestCard.svelte
+++ b/daemon/web/src/lib/components/ManifestCard.svelte
@@ -44,7 +44,7 @@
 </script>

 <div
-    class="{status_row_color} {status_border_color} drop-shadow p-4 flex flex-col gap-2 border rounded-md flex-1 overflow-x-auto overflow-y-hidden"
+    class="{status_row_color} {status_border_color} drop-shadow p-4 flex flex-col gap-2 border rounded-md flex-1 overflow-x-scroll overflow-y-hidden"
 >
    {#if current}
        <div class="flex flex-row justify-between gap-2">
@@ -81,7 +81,7 @@
                'N/A'}</span
        >
    </div>
-    <div class="flex flex-row justify-between lg:justify-end gap-1 mt-2 overflow-x-auto">
+    <div class="flex flex-row justify-between lg:justify-end gap-1 mt-2 overflow-x-scroll">
        <DownloadLink url={entry.get_pcap_url()} text="pcap" full_button />
        <DownloadLink url={entry.get_qmdl_url()} text="qmdl" full_button />
        <DownloadLink url={entry.get_zip_url()} text="zip" full_button />
--- a/daemon/web/src/lib/utils.svelte.ts
+++ b/daemon/web/src/lib/utils.svelte.ts
@@ -12,17 +12,11 @@ export interface AnalyzerConfig {
    test_analyzer: boolean;
 }

-export enum enabled_notifications {
-    Warning = 'Warning',
-    LowBattery = 'LowBattery',
-}
-
 export interface Config {
    ui_level: number;
    colorblind_mode: boolean;
    key_input_mode: number;
    ntfy_url: string;
-    enabled_notifications: enabled_notifications[];
    analyzers: AnalyzerConfig;
 }

--- a/daemon/web/src/routes/+page.svelte
+++ b/daemon/web/src/routes/+page.svelte
@@ -14,7 +14,6 @@

    let manager: AnalysisManager = new AnalysisManager();
    let loaded = $state(false);
-    let filter_threshold: boolean = $state(false);
    let entries: ManifestEntry[] = $state([]);
    let current_entry: ManifestEntry | undefined = $state(undefined);
    let system_stats: SystemStats | undefined = $state(undefined);
@@ -31,10 +30,7 @@
                await manager.update();
                let new_manifest = await get_manifest();
                await new_manifest.set_analysis_status(manager);
-                entries = filter_threshold
-                    ? new_manifest.entries.filter((e) => e.get_num_warnings())
-                    : new_manifest.entries;
-
+                entries = new_manifest.entries;
                current_entry = new_manifest.current_entry;

                system_stats = await get_system_stats();
@@ -230,23 +226,7 @@
            <SystemStatsTable stats={system_stats!} />
        </div>
        <div class="flex flex-col gap-2">
-            <div class="flex flex-row gap-2">
-                <div class="text-xl flex-1">History</div>
-                <div class="flex flex-row items-center gap-2 px-3">
-                    <label
-                        for="filter_threshold"
-                        class="block text-md font-medium text-gray-700 mb-1"
-                    >
-                        Filter for Warnings
-                    </label>
-                    <input
-                        type="checkbox"
-                        id="filter_threshold"
-                        bind:checked={filter_threshold}
-                        class="px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:ring-2 focus:ring-rayhunter-blue"
-                    />
-                </div>
-            </div>
+            <span class="text-xl">History</span>
            <ManifestTable {entries} server_is_recording={!!current_entry} {manager} />
        </div>
        <DeleteAllButton />
--- a/daemon/web/static/rayhunter_icon.png
+++ b/daemon/web/static/rayhunter_icon.png
--- a/dist/config.toml.in
+++ b/dist/config.toml.in
@@ -23,9 +23,7 @@ ui_level = 1
 key_input_mode = 0

 # If set, attempts to send a notification to the url when a new warning is triggered
-ntfy_url = ""
-# What notification types to enable. Does nothing if the above ntfy_url is not set.
-enabled_notifications = ["Warning", "LowBattery"]
+# ntfy_url =

 # Analyzer Configuration
 # Enable/disable specific IMSI catcher detection heuristics
@@ -37,4 +35,4 @@ lte_sib6_and_7_downgrade = true
 null_cipher = true
 nas_null_cipher = true
 incomplete_sib = true
-test_analyzer = false
+test_analyzer = false
--- a/doc/analyzing-a-capture.md
+++ b/doc/analyzing-a-capture.md
@@ -1,3 +1,3 @@
 # How we analyze a capture

-Teams of highly trained squirrels. Video coming soon!
+Teams of highly trained squirrles. Video coming soon!
--- a/doc/configuration.md
+++ b/doc/configuration.md
@@ -12,12 +12,9 @@ Through web UI you can set:
  - *EFF logo*, which shows EFF logo and *and* colored line.
 - **Device Input Mode**, which defines behaviour of built-in power button of the device. *Device Input Mode* could be:
  - *Disable button control*: built-in power button of the device is not used by Rayhunter;
-  - *Double-tap power button to start/stop recording*: double clicking on a built-in power button of the device stops and immediately restarts the recording. This could be useful if Rayhunter's heuristichs is triggered and you get the red line, and you want to "reset" the past warnings. Normally you can do that through web UI, but sometimes it is easier to double tap on power button.
+  - *Double-tap power button to start/stop recording*: double clicking on a built-in power button of the device stops and immediatelly restarts the recording. This could be useful if Rayhunter's heuristichs is triggered and you get the red line, and you want to "reset" the past warnings. Normally you can do that through web UI, but sometimes it is easier to double tap on power button.
+- **ntfy URL for Sending Notifications**, which allows setting a [ntfy](https://ntfy.sh/) URL to which notifications of new detections will be sent. The topic should be unique to your device, e.g., `https://ntfy.sh/rayhunter_notifications_ba9di7ie` or `https://myserver.example.com/rayhunter_notifications_ba9di7ie`. The ntfy Android and iOS apps can then be used to receive notifications. More information can be found in the [ntfy docs](https://docs.ntfy.sh/).
 - **Colorblind Mode** enables color blind mode (blue line is shown instead of green line, red line remains red). Please note that this does not cover all types of color blindness, but switching green to blue should be about enough to differentiate the color change for most types of color blindness.
- **ntfy URL**, which allows setting a [ntfy](https://ntfy.sh/) URL to which notifications of new detections will be sent. The topic should be unique to your device, e.g., `https://ntfy.sh/rayhunter_notifications_ba9di7ie` or `https://myserver.example.com/rayhunter_notifications_ba9di7ie`. The ntfy Android and iOS apps can then be used to receive notifications. More information can be found in the [ntfy docs](https://docs.ntfy.sh/).
- **Enabled Notification Types** allows enabling or disabling the following types of notifications:
-  - *Warnings*, which will alert when a heuristic is triggered. Alerts will be sent at most once every five minutes.
-  - *Low Battery*, which will alert when the device's battery is low. Notifications may not be supported for all devices—you can check if your device is supported by looking at whether the battery level indicator is functioning on the System Information section of the Rayhunter UI.
 - With **Analyzer Heuristic Settings** you can switch on or off built-in [Rayhunter heuristics](heuristics.md). Some heuristics are experimental or can trigger a lot of false positive warnings in some networks (our tests have shown that some heuristics have different behaviour in US or European networks). In that case you can decide whether you would like to have the heuristics that trigger a lot of false positives on or off. Please note that we are constantly improving and adding new heuristics, so new release may reduce false positives in existing heuristics as well.

 If you prefer editing `config.toml` file, you need to obtain a shell on your [Orbic](./orbic.md#obtaining-a-shell) or [TP-Link](./tplink-m7350.md#obtaining-a-shell) device and edit the file manually. You can view the [default configuration file on a GitHub](https://github.com/EFForg/rayhunter/blob/main/dist/config.toml.in).
--- a/doc/faq.md
+++ b/doc/faq.md
@@ -5,7 +5,7 @@
 **It Depends**. Operation of Rayhunter does require the insertion of a SIM card into the device, but that sim card does not have to be actively registered with a service plan. If you want to use the device as a hotspot in addition to a research device, or get [notifications](./configuration.md), an active plan would of course be necessary.

 ### How can I test that my device is working?
-You can enable the `Test Heuristic` under `Analyzer Heuristic Settings` in the config section on your web dashboard. This will cause an alert to trigger every time your device sees a cell tower, you might need to reboot your device or move around a bit to get this one to trigger, but it will be very noisey once it does. People have also tested it by building IMSI catchers at home, but we don't recommend that, since it violates FCC regulations and will probably upset your neighbors.
+You can enable the `Test Heuristic` under `Analyzer Heuristic Settings` in the config section on your web dashboard. This will cause an alert to trigger every time your device sees a cell tower, you might need to reboot your device or move around a bit to get this one to trigger, but it will be very noisey once it does. People have also tested it by building IMSI catchers at home, but we don't reccomend that, since it violates FCC regulations and will probably upset your neighbors.

 <a name="red"></a>

--- a/doc/heuristics.md
+++ b/doc/heuristics.md
@@ -6,7 +6,7 @@ Rayhunter includes several analyzers to detect potential IMSI catcher activity.

 ### IMSI Requested (v3)

-This analyser tests whether the eNodeB sends an IMSI or IMEI Identity Request NAS message under suspicious .
+This analyser tests whether the eNodeB sends an IMSI or IMEI Identity Request NAS message under suspicous .

 Mobile networks primarily request IMSI or IMEI from a mobile device during initial network attachment or when the network cannot identify the mobile device by its temporary identification (TMSI - *Temporary Mobile Subscriber Identity* or GUTI - *Globally Unique Temporary Identifier* in 4G/5G terminology).

@@ -21,7 +21,7 @@ What we consider suspicious is the following chain of events:
 * Phone connects to a new tower. 
 * Tower asks for phones identity (IMEI or IMSI.)
 * Authentication does *NOT* happen. 
-* Tower requests phone to disconnect. 
+* Tower requests phoen to disconnect. 

 Looking for this chain of events is much less prone to false positives than naively looking for any time the IMSI/IMEI is sent. We do still sometimes get false positives when users are in an airplane that is coming in for a landing however. This is likely do to having been disconnected for a while and then being over towers that are not able to route to your home network, but we are still researching.

@@ -75,4 +75,4 @@ On its own this might just be a misconfigured base station (though we have only

 ### Test Analyzer

-This analyzer is great for testing if your Rayhunter installation works. It will alert every time a new tower is seen (specifically every time a tower broadcasts a SIB1 message.) It is designed to be very noisey so we do not recommend leaving it on but if this alerts it means your Rayhunter device is working! 
+This analyzer is great for testing if your Rayhunter installation works. It will alert every time a new tower is seen (specifically every time a tower broadcasts a SIB1 message.) It is designed to be very noisey so we do not reccomend leaving it on but if this alerts it means your Rayhunter device is working! 
--- a/doc/installing-from-release-windows.md
+++ b/doc/installing-from-release-windows.md
@@ -14,7 +14,7 @@ Windows support in Rayhunter's installer is a work-in-progress. Depending on the

 <div class=warning><strong>

-[The Windows USB installer is known to be buggy](https://github.com/EFForg/rayhunter/issues/366). We strongly recommend using the [Network-based installer](./orbic.md#the-network-installer).
+[The Windows USB installer is known to be buggy](https://github.com/EFForg/rayhunter/issues/366). We strongly reccomend using the [Network-based installer](./orbic.md#the-network-installer).

 </strong></div>

--- a/doc/installing-from-release.md
+++ b/doc/installing-from-release.md
@@ -21,7 +21,7 @@ Make sure you've got one of Rayhunter's [supported devices](./supported-devices.
 4. Turn on your device by holding the power button on the front.

   * For the Orbic, connect the device using a USB-C cable.
-     * Or connect to the network if using the network based installer, this is especially recommended on Windows.
+     * Or connect to the network if using the network based installer, this is especially reccomended on Windows.
   * For TP-Link, connect to its network using either WiFi or USB Tethering.

 5. Run the installer:
@@ -44,8 +44,6 @@ Make sure you've got one of Rayhunter's [supported devices](./supported-devices.

 ## Troubleshooting

-* If you are having trouble installing Rayhunter and you're connecting to your device over USB, try using a different USB cable to connect the device to your computer. If you are using a USB hub, try using a different one or directly connecting the device to a USB port on your computer. A faulty USB connection can cause the Rayhunter installer to fail.
-
 * You can test your device by enabling the test heuristic. This will be very noisy and fire an alert every time you see a new tower. Be sure to turn it off when you are done testing.  

 * On MacOS if you encounter an error that says "No Orbic device found," it may because you have the "Allow accessories to connect" security setting set to "Ask for approval." You may need to temporarily change it to "Always" for the script to run. Make sure to change it back to a more secure setting when you're done.
--- a/doc/installing-from-source.md
+++ b/doc/installing-from-source.md
@@ -36,28 +36,21 @@ rustup target add x86_64-pc-windows-gnu
 Now you can root your device and install Rayhunter by running:

 ```sh
-# Build the daemon binary for local development (rustcrypto TLS backend, fast compilation)
-# WARNING: The rustcrypto library, though not known to be insecure, is less well
-# tested than its counterpart and could potentially have severe issues in
-# its cryptographic implementation. We therefore recommend using ring-tls in
-# production builds (see below)
-cargo build-daemon-firmware-devel
+# Profile can be changed to 'firmware-devel' when building for development.
+# Build time will decrease at the expense of binary size.
+cargo build --bin rayhunter-daemon --target armv7-unknown-linux-musleabihf --profile firmware

-# To build it exactly like in CI (more mature ring TLS backend, slower compilation)
-# CC_armv7_unknown_linux_musleabihf=arm-linux-gnueabihf-gcc cargo build-daemon-firmware
-
-# Build rootshell
-cargo build -p rootshell --bin rootshell --target armv7-unknown-linux-musleabihf --profile firmware
+cargo build --bin rootshell --target armv7-unknown-linux-musleabihf --profile firmware

 # Replace 'orbic' with your device type if different.
-# A list of possible values can be found with 'cargo run --bin installer help'.
-cargo run -p installer --bin installer orbic
+# A list possible values can be found with 'cargo run --bin installer help'.
+cargo run --bin installer orbic
 ```

 ### If you're on Windows or can't run the install scripts

 * Root your device on Windows using the instructions here: <https://xdaforums.com/t/resetting-verizon-orbic-speed-rc400l-firmware-flash-kajeet.4334899/#post-87855183>
-* Build the web UI using `cd daemon/web && npm install && npm run build`
+* Build the web UI using `cd bin/web && npm install && npm run build`
 * Push the scripts in `scripts/` to `/etc/init.d` on device and make a directory called `/data/rayhunter` using `adb shell` (and sshell for your root shell if you followed the steps above)
 * You also need to copy `config.toml.in` to `/data/rayhunter/config.toml`. Uncomment the `device` line and set the value to your device type if necessary.
 * Then run `./make.sh`, which will build the binary, push it over adb, and restart the device. Once it's restarted, Rayhunter should be running!
--- a/doc/rayhunter_config.png
+++ b/doc/rayhunter_config.png
--- a/doc/tplink-m7350.md
+++ b/doc/tplink-m7350.md
@@ -52,7 +52,7 @@ If your device has a one-bit (black-and-white) display, Rayhunter will instead s
 ## Power-saving mode/sleep

 By default the device will go to sleep after N minutes of no devices being connected. In that mode it will also turn off connections to cell phone towers.
-In order for Rayhunter to record continuously, you have to turn off this sleep mode in TP-Link's admin panel (go to **Advanced** - **Power Saving**) or keep e.g. your phone connected on the TP-Link's WiFi.
+In order for Rayhunter to record continuously, you have to turn off this sleep mode in TP-Link's admin panel (go to **Advanced** - **Power Saving**) or keep e.g. your phone connectd on the TP-Link's WiFi.

 ## Port triggers

--- a/doc/using-rayhunter.md
+++ b/doc/using-rayhunter.md
@@ -28,4 +28,4 @@ You can access this UI in one of two ways:

 ## Key shortcuts

-As of Rayhunter version 0.3.3, you can start a new recording by double-tapping the power button. Any current recording will be stopped and a new recording will be started, resetting the red line as well. This feature is disabled by default since Rayhunter version 0.4.0 and needs to be enabled through [configuration](./configuration.md).
+As of Rayhunter verion 0.3.3, you can start a new recording by double-tapping the power button. Any current recording will be stopped and a new recording will be started, resetting the red line as well. This feature is disabled by default since Rayhunter version 0.4.0 and needs to be enabled through [configuration](./configuration.md).
--- a/installer/Cargo.toml
+++ b/installer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "installer"
-version = "0.7.0"
+version = "0.6.1"
 edition = "2024"

 [dependencies]
@@ -26,12 +26,12 @@ tokio-stream = "0.1.17"

 [target.'cfg(target_os = "linux")'.dependencies.adb_client]
 git = "https://github.com/EFForg/adb_client.git"
-rev = "e511662394e4fa32865c154c40f81a3d846f700c"
+rev = "208a302367727554d7530e937ca8aee20a74fa51"
 default-features = false
 features = ["trans-nusb"]

 [target.'cfg(any(target_os = "windows", target_os = "macos"))'.dependencies.adb_client]
 git = "https://github.com/EFForg/adb_client.git"
-rev = "e511662394e4fa32865c154c40f81a3d846f700c"
+rev = "208a302367727554d7530e937ca8aee20a74fa51"
 default-features = false
 features = ["trans-libusb"]
--- a/installer/src/orbic.rs
+++ b/installer/src/orbic.rs
@@ -246,7 +246,7 @@ async fn get_adb() -> Result<ADBUSBDevice> {
    const MAX_FAILURES: u32 = 10;
    let mut failures = 0;
    loop {
-        match ADBUSBDevice::new(VENDOR_ID, PRODUCT_ID) {
+        match ADBUSBDevice::new_no_auth(VENDOR_ID, PRODUCT_ID) {
            Ok(dev) => match adb_echo_test(dev).await {
                Ok(dev) => return Ok(dev),
                Err(e) => {
--- a/installer/src/pinephone.rs
+++ b/installer/src/pinephone.rs
@@ -22,7 +22,7 @@ pub async fn install() -> Result<()> {
    echo!("Unlocking modem ... ");
    start_adb().await?;
    sleep(Duration::from_secs(3)).await;
-    let mut adb = ADBUSBDevice::new(USB_VENDOR_ID, USB_PRODUCT_ID).unwrap();
+    let mut adb = ADBUSBDevice::new_no_auth(USB_VENDOR_ID, USB_PRODUCT_ID).unwrap();
    println!("ok");

    adb.run_command(&["mount", "-o", "remount,rw", "/"], "exit code 0")?;
@@ -57,7 +57,7 @@ pub async fn install() -> Result<()> {
    echo!("Unlocking modem ... ");
    start_adb().await?;
    sleep(Duration::from_secs(3)).await;
-    let mut adb = ADBUSBDevice::new(USB_VENDOR_ID, USB_PRODUCT_ID).unwrap();
+    let mut adb = ADBUSBDevice::new_no_auth(USB_VENDOR_ID, USB_PRODUCT_ID).unwrap();
    println!("ok");

    echo!("Testing rayhunter ... ");
--- a/installer/src/tplink.rs
+++ b/installer/src/tplink.rs
@@ -104,16 +104,7 @@ async fn tplink_run_install(
    println!("Connecting via telnet to {admin_ip}");
    let addr = SocketAddr::from_str(&format!("{admin_ip}:23")).unwrap();

-    if skip_sdcard {
-        sdcard_path = "/data/rayhunter-data".to_owned();
-        telnet_send_command(
-            addr,
-            &format!("mkdir -p {sdcard_path}"),
-            "exit code 0",
-            true,
-        )
-        .await?
-    } else {
+    if !skip_sdcard {
        if sdcard_path.is_empty() {
            let try_paths = [
                // TP-Link hardware less than v9.0
@@ -272,19 +263,9 @@ async fn handler(state: State<AppState>, mut req: Request) -> Result<Response, S
        let mut data = BytesMut::from(data);
        // inject some javascript into the admin UI to get us a telnet shell.
        data.extend(br#";window.rayhunterPoll = window.setInterval(() => {
-            // Intentionally register rayhunter-daemon before rayhunter-root so that we are less
-            // likely to run into race conditions where rayhunter-root is launched, and the
-            // installer kills the server. In practice both HTTP requests may execute concurrently
-            // anyway.
-            Globals.models.PTModel.add({applicationName: "rayhunter-daemon", enableState: 1, entryId: 2, openPort: "2400-2500", openProtocol: "TCP", triggerPort: "$(/etc/init.d/rayhunter_daemon start)", triggerProtocol: "TCP"});
            Globals.models.PTModel.add({applicationName: "rayhunter-root", enableState: 1, entryId: 1, openPort: "2300-2400", openProtocol: "TCP", triggerPort: "$(busybox telnetd -l /bin/sh)", triggerProtocol: "TCP"});
-
-            // Do not use alert(), instead replace page with success message. Using alert() will
-            // block the event loop in such a way that any background promises are blocked from
-            // progress too. For example: The HTTP requests to register our port triggers!
-            document.body.innerHTML = "<h1>Success! You can go back to the rayhunter installer.</h1>";
-
-            // We can stop polling now, presumably both requests are already inflight.
+            Globals.models.PTModel.add({applicationName: "rayhunter-daemon", enableState: 1, entryId: 2, openPort: "2400-2500", openProtocol: "TCP", triggerPort: "$(/etc/init.d/rayhunter_daemon start)", triggerProtocol: "TCP"});
+            alert("Success! You can go back to the rayhunter installer.");
            window.clearInterval(window.rayhunterPoll);
        }, 1000);"#);
        response = Response::from_parts(parts, Body::from(Bytes::from(data)));
@@ -295,16 +276,6 @@ async fn handler(state: State<AppState>, mut req: Request) -> Result<Response, S
 }

 async fn tplink_launch_telnet_v5(admin_ip: &str) -> Result<(), Error> {
-    let addr = SocketAddr::from_str(&format!("{admin_ip}:23")).unwrap();
-
-    if telnet_send_command(addr, "true", "exit code 0", true)
-        .await
-        .is_ok()
-    {
-        println!("telnet already appears to be running");
-        return Ok(());
-    }
-
    let client: HttpProxyClient =
        hyper_util::client::legacy::Client::<(), ()>::builder(TokioExecutor::new())
            .build(HttpConnector::new());
@@ -326,6 +297,8 @@ async fn tplink_launch_telnet_v5(admin_ip: &str) -> Result<(), Error> {

    let handle = tokio::spawn(async move { axum::serve(listener, app).await });

+    let addr = SocketAddr::from_str(&format!("{admin_ip}:23")).unwrap();
+
    while telnet_send_command(addr, "true", "exit code 0", true)
        .await
        .is_err()
@@ -333,9 +306,6 @@ async fn tplink_launch_telnet_v5(admin_ip: &str) -> Result<(), Error> {
        sleep(Duration::from_millis(1000)).await;
    }

-    // give the JavaScript code some additional time to run and persist the port triggers.
-    sleep(Duration::from_millis(1000)).await;
-
    handle.abort();

    Ok(())
--- a/installer/src/uz801.rs
+++ b/installer/src/uz801.rs
@@ -94,7 +94,7 @@ async fn wait_for_adb() -> Result<ADBUSBDevice> {

        // UZ801 USB vendor and product IDs.
        // TODO: Research if other variants use different IDs.
-        match ADBUSBDevice::new(0x05c6, 0x90b6) {
+        match ADBUSBDevice::new_no_auth(0x05c6, 0x90b6) {
            Ok(mut device) => {
                // Test ADB connection
                if test_adb_connection(&mut device).await.is_ok() {
--- a/lib/Cargo.toml
+++ b/lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rayhunter"
-version = "0.7.0"
+version = "0.6.1"
 edition = "2024"
 description = "Realtime cellular data decoding and analysis for IMSI catcher detection"

--- a/lib/src/analysis/analyzer.rs
+++ b/lib/src/analysis/analyzer.rs
@@ -124,11 +124,7 @@ pub trait Analyzer {
    /// heuristic deems it relevant. Again, be mindful of any state your
    /// [Analyzer] updates per message, since it may be run over hundreds or
    /// thousands of them alongside many other [Analyzers](Analyzer).
-    fn analyze_information_element(
-        &mut self,
-        ie: &InformationElement,
-        packet_num: usize,
-    ) -> Option<Event>;
+    fn analyze_information_element(&mut self, ie: &InformationElement) -> Option<Event>;

    /// Returns a version number for this Analyzer. This should only ever
    /// increase in value, and do so whenever substantial changes are made to
@@ -300,7 +296,6 @@ impl<'de> Deserialize<'de> for AnalysisRow {

 pub struct Harness {
    analyzers: Vec<Box<dyn Analyzer + Send>>,
-    packet_num: usize,
 }

 impl Default for Harness {
@@ -313,7 +308,6 @@ impl Harness {
    pub fn new() -> Self {
        Self {
            analyzers: Vec::new(),
-            packet_num: 0,
        }
    }

@@ -334,15 +328,15 @@ impl Harness {
        }

        if analyzer_config.nas_null_cipher {
-            harness.add_analyzer(Box::new(NasNullCipherAnalyzer {}))
+            harness.add_analyzer(Box::new(NasNullCipherAnalyzer::new()))
        }

        if analyzer_config.incomplete_sib {
-            harness.add_analyzer(Box::new(IncompleteSibAnalyzer {}))
+            harness.add_analyzer(Box::new(IncompleteSibAnalyzer::new()))
        }

        if analyzer_config.test_analyzer {
-            harness.add_analyzer(Box::new(TestAnalyzer {}))
+            harness.add_analyzer(Box::new(TestAnalyzer::new()))
        }

        harness
@@ -353,8 +347,6 @@ impl Harness {
    }

    pub fn analyze_pcap_packet(&mut self, packet: EnhancedPacketBlock) -> AnalysisRow {
-        self.packet_num += 1;
-
        let epoch = DateTime::parse_from_rfc3339("1980-01-06T00:00:00-00:00").unwrap();
        let mut row = AnalysisRow {
            packet_timestamp: Some(epoch + packet.timestamp),
@@ -391,8 +383,6 @@ impl Harness {
    pub fn analyze_qmdl_messages(&mut self, container: MessagesContainer) -> Vec<AnalysisRow> {
        let mut rows = Vec::new();
        for maybe_qmdl_message in container.into_messages() {
-            self.packet_num += 1;
-
            rows.push(AnalysisRow {
                packet_timestamp: None,
                skipped_message_reason: None,
@@ -434,21 +424,10 @@ impl Harness {
        rows
    }

-    fn analyze_information_element(&mut self, ie: &InformationElement) -> Vec<Option<Event>> {
-        // This method is private because incrementing packet_num is currently handled entirely by the other
-        // methods that call this one. This could be changed with some careful refactoring, but
-        // while this method is only used by other Harness methods, let's keep it private to help
-        // ensure we always bump packet_num exactly once for each processed packet.
-        let packet_str = format!(" (packet {})", self.packet_num);
+    pub fn analyze_information_element(&mut self, ie: &InformationElement) -> Vec<Option<Event>> {
        self.analyzers
            .iter_mut()
-            .map(|analyzer| {
-                let mut maybe_event = analyzer.analyze_information_element(ie, self.packet_num);
-                if let Some(ref mut event) = maybe_event {
-                    event.message.push_str(&packet_str);
-                }
-                maybe_event
-            })
+            .map(|analyzer| analyzer.analyze_information_element(ie))
            .collect()
    }

--- a/lib/src/analysis/connection_redirect_downgrade.rs
+++ b/lib/src/analysis/connection_redirect_downgrade.rs
@@ -25,11 +25,7 @@ impl Analyzer for ConnectionRedirect2GDowngradeAnalyzer {
        1
    }

-    fn analyze_information_element(
-        &mut self,
-        ie: &InformationElement,
-        _packet_num: usize,
-    ) -> Option<Event> {
+    fn analyze_information_element(&mut self, ie: &InformationElement) -> Option<Event> {
        if let InformationElement::LTE(lte_ie) = ie
            && let LteInformationElement::DlDcch(msg_cont) = &**lte_ie
            && let DL_DCCH_MessageType::C1(c1) = &msg_cont.message
--- a/lib/src/analysis/imsi_requested.rs
+++ b/lib/src/analysis/imsi_requested.rs
@@ -23,6 +23,7 @@ pub enum State {
 }

 pub struct ImsiRequestedAnalyzer {
+    packet_num: usize,
    state: State,
    timeout_counter: usize,
    flag: Option<Event>,
@@ -37,19 +38,20 @@ impl Default for ImsiRequestedAnalyzer {
 impl ImsiRequestedAnalyzer {
    pub fn new() -> Self {
        Self {
+            packet_num: 0,
            state: State::Unattached,
            timeout_counter: 0,
            flag: None,
        }
    }

-    fn transition(&mut self, next_state: State, packet_num: usize) {
+    fn transition(&mut self, next_state: State) {
        match (&self.state, &next_state) {
            // Reset timeout on successful auth
            (_, State::AuthAccept) => {
                debug!(
                    "reset timeout counter at {} due to auth accept (frame {})",
-                    self.timeout_counter, packet_num
+                    self.timeout_counter, self.packet_num
                );
                self.timeout_counter = 0;
            }
@@ -58,7 +60,10 @@ impl ImsiRequestedAnalyzer {
            (State::AuthAccept, State::IdentityRequest) => {
                self.flag = Some(Event {
                    event_type: EventType::High,
-                    message: "Identity requested after auth request".to_string(),
+                    message: format!(
+                        "Identity requested after auth request (frame {})",
+                        self.packet_num
+                    ),
                });
            }

@@ -66,7 +71,10 @@ impl ImsiRequestedAnalyzer {
            (State::Disconnect, State::IdentityRequest) => {
                self.flag = Some(Event {
                    event_type: EventType::High,
-                    message: "Identity requested without Attach Request".to_string(),
+                    message: format!(
+                        "Identity requested without Attach Request (frame {})",
+                        self.packet_num
+                    ),
                });
            }

@@ -74,7 +82,10 @@ impl ImsiRequestedAnalyzer {
            (State::IdentityRequest, State::Disconnect) => {
                self.flag = Some(Event {
                    event_type: EventType::High,
-                    message: "Disconnected after Identity Request without Auth Accept".to_string(),
+                    message: format!(
+                        "Disconnected after Identity Request without Auth Accept (frame {})",
+                        self.packet_num
+                    ),
                });
            }

@@ -82,7 +93,11 @@ impl ImsiRequestedAnalyzer {
            (_, State::IdentityRequest) => {
                self.flag = Some(Event {
                    event_type: EventType::Informational,
-                    message: "Identity Request happened but its not suspicious yet.".to_string(),
+                    message: format!(
+                        "Identity Request happened but its not suspicious yet. (frame {})",
+                        self.packet_num
+                    )
+                    .to_string(),
                });
                self.timeout_counter = 0;
            }
@@ -91,7 +106,7 @@ impl ImsiRequestedAnalyzer {
            _ => {
                debug!(
                    "Transition from {:?} to {:?} at {}",
-                    self.state, next_state, packet_num
+                    self.state, next_state, self.packet_num
                );
            }
        }
@@ -114,31 +129,29 @@ impl Analyzer for ImsiRequestedAnalyzer {
        3
    }

-    fn analyze_information_element(
-        &mut self,
-        ie: &InformationElement,
-        packet_num: usize,
-    ) -> Option<Event> {
+    fn analyze_information_element(&mut self, ie: &InformationElement) -> Option<Event> {
+        self.packet_num += 1;
+
        if let InformationElement::LTE(inner) = ie {
            match &**inner {
                LteInformationElement::NAS(payload) => match payload {
                    NASMessage::EMMMessage(EMMMessage::EMMExtServiceRequest(_))
                    | NASMessage::EMMMessage(EMMMessage::EMMAttachRequest(_)) => {
-                        self.transition(State::AttachRequest, packet_num);
+                        self.transition(State::AttachRequest);
                    }
                    NASMessage::EMMMessage(EMMMessage::EMMIdentityRequest(_)) => {
-                        self.transition(State::IdentityRequest, packet_num);
+                        self.transition(State::IdentityRequest);
                    }
                    NASMessage::EMMMessage(EMMMessage::EMMAttachComplete(_))
                    | NASMessage::EMMMessage(EMMMessage::EMMAuthenticationResponse(_)) => {
-                        self.transition(State::AuthAccept, packet_num);
+                        self.transition(State::AuthAccept);
                    }
                    NASMessage::EMMMessage(EMMMessage::EMMServiceReject(_))
                    | NASMessage::EMMMessage(EMMMessage::EMMAttachReject(_))
                    | NASMessage::EMMMessage(EMMMessage::EMMDetachRequestMO(_))
                    | NASMessage::EMMMessage(EMMMessage::EMMDetachRequestMT(_))
                    | NASMessage::EMMMessage(EMMMessage::EMMTrackingAreaUpdateReject(_)) => {
-                        self.transition(State::Disconnect, packet_num);
+                        self.transition(State::Disconnect);
                    }
                    _ => {}
                },
@@ -148,7 +161,7 @@ impl Analyzer for ImsiRequestedAnalyzer {
                    | UL_CCCH_MessageType::C1(
                        UL_CCCH_MessageType_c1::RrcConnectionReestablishmentRequest(_),
                    ) => {
-                        self.transition(State::AttachRequest, packet_num);
+                        self.transition(State::AttachRequest);
                    }
                    _ => {}
                },
@@ -158,7 +171,7 @@ impl Analyzer for ImsiRequestedAnalyzer {
                        _,
                    )) = rrc_payload.message
                    {
-                        self.transition(State::Disconnect, packet_num)
+                        self.transition(State::Disconnect)
                    }
                }
                _ => {}
@@ -169,12 +182,16 @@ impl Analyzer for ImsiRequestedAnalyzer {
            self.timeout_counter += 1;
            debug!(
                "timeout: counter {}, packet: {}",
-                self.timeout_counter, packet_num
+                self.timeout_counter, self.packet_num
            );
            if self.timeout_counter >= TIMEOUT_THRESHHOLD {
                self.flag = Some(Event {
                    event_type: EventType::Informational {},
-                    message: "Identity request happened without auth request followup".to_string(),
+                    message: format!(
+                        "Identity request happened without auth request followup (frame {})",
+                        self.packet_num
+                    )
+                    .to_string(),
                });
                self.timeout_counter = 0;
            }
--- a/lib/src/analysis/incomplete_sib.rs
+++ b/lib/src/analysis/incomplete_sib.rs
@@ -5,7 +5,21 @@ use telcom_parser::lte_rrc::{BCCH_DL_SCH_MessageType, BCCH_DL_SCH_MessageType_c1
 use super::analyzer::{Analyzer, Event, EventType};
 use super::information_element::{InformationElement, LteInformationElement};

-pub struct IncompleteSibAnalyzer {}
+pub struct IncompleteSibAnalyzer {
+    packet_num: usize,
+}
+
+impl Default for IncompleteSibAnalyzer {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl IncompleteSibAnalyzer {
+    pub fn new() -> Self {
+        Self { packet_num: 0 }
+    }
+}

 impl Analyzer for IncompleteSibAnalyzer {
    fn get_name(&self) -> Cow<'_, str> {
@@ -17,14 +31,12 @@ impl Analyzer for IncompleteSibAnalyzer {
    }

    fn get_version(&self) -> u32 {
-        2
+        1
    }

-    fn analyze_information_element(
-        &mut self,
-        ie: &InformationElement,
-        _packet_num: usize,
-    ) -> Option<Event> {
+    fn analyze_information_element(&mut self, ie: &InformationElement) -> Option<Event> {
+        self.packet_num += 1;
+
        if let InformationElement::LTE(lte_ie) = ie
            && let LteInformationElement::BcchDlSch(sch_msg) = &**lte_ie
            && let BCCH_DL_SCH_MessageType::C1(c1) = &sch_msg.message
@@ -32,8 +44,11 @@ impl Analyzer for IncompleteSibAnalyzer {
            && sib1.scheduling_info_list.0.len() < 2
        {
            return Some(Event {
-                event_type: EventType::Informational,
-                message: "SIB1 scheduling info list was malformed".to_string(),
+                event_type: EventType::Medium,
+                message: format!(
+                    "SIB1 scheduling info list was malformed (packet {})",
+                    self.packet_num
+                ),
            });
        }
        None
--- a/lib/src/analysis/nas_null_cipher.rs
+++ b/lib/src/analysis/nas_null_cipher.rs
@@ -7,7 +7,21 @@ use pycrate_rs::nas::generated::emm::emm_security_mode_command::NASSecAlgoCiphAl
 use super::analyzer::{Analyzer, Event, EventType};
 use super::information_element::{InformationElement, LteInformationElement};

-pub struct NasNullCipherAnalyzer {}
+pub struct NasNullCipherAnalyzer {
+    packet_num: usize,
+}
+
+impl Default for NasNullCipherAnalyzer {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl NasNullCipherAnalyzer {
+    pub fn new() -> Self {
+        Self { packet_num: 0 }
+    }
+}

 impl Analyzer for NasNullCipherAnalyzer {
    fn get_name(&self) -> Cow<'_, str> {
@@ -24,11 +38,8 @@ impl Analyzer for NasNullCipherAnalyzer {
        1
    }

-    fn analyze_information_element(
-        &mut self,
-        ie: &InformationElement,
-        _packet_num: usize,
-    ) -> Option<Event> {
+    fn analyze_information_element(&mut self, ie: &InformationElement) -> Option<Event> {
+        self.packet_num += 1;
        let payload = match ie {
            InformationElement::LTE(inner) => match &**inner {
                LteInformationElement::NAS(payload) => payload,
@@ -42,7 +53,10 @@ impl Analyzer for NasNullCipherAnalyzer {
        {
            return Some(Event {
                event_type: EventType::High,
-                message: "NAS Security mode command requested null cipher".to_string(),
+                message: format!(
+                    "NAS Security mode command requested null cipher(packet {})",
+                    self.packet_num
+                ),
            });
        }
        None
--- a/lib/src/analysis/null_cipher.rs
+++ b/lib/src/analysis/null_cipher.rs
@@ -131,11 +131,7 @@ impl Analyzer for NullCipherAnalyzer {
        1
    }

-    fn analyze_information_element(
-        &mut self,
-        ie: &InformationElement,
-        _packet_num: usize,
-    ) -> Option<Event> {
+    fn analyze_information_element(&mut self, ie: &InformationElement) -> Option<Event> {
        let dcch_msg = match ie {
            InformationElement::LTE(lte_ie) => match &**lte_ie {
                LteInformationElement::DlDcch(dcch_msg) => dcch_msg,
--- a/lib/src/analysis/priority_2g_downgrade.rs
+++ b/lib/src/analysis/priority_2g_downgrade.rs
@@ -49,7 +49,6 @@ impl Analyzer for LteSib6And7DowngradeAnalyzer {
    fn analyze_information_element(
        &mut self,
        ie: &InformationElement,
-        _packet_num: usize,
    ) -> Option<super::analyzer::Event> {
        let sibs = &self.unpack_system_information(ie)?.0;
        for sib in sibs {
--- a/lib/src/analysis/test_analyzer.rs
+++ b/lib/src/analysis/test_analyzer.rs
@@ -6,7 +6,21 @@ use super::analyzer::{Analyzer, Event, EventType};
 use super::information_element::{InformationElement, LteInformationElement};
 use deku::bitvec::*;

-pub struct TestAnalyzer {}
+pub struct TestAnalyzer {
+    packet_num: usize,
+}
+
+impl Default for TestAnalyzer {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl TestAnalyzer {
+    pub fn new() -> Self {
+        Self { packet_num: 0 }
+    }
+}

 impl Analyzer for TestAnalyzer {
    fn get_name(&self) -> Cow<'_, str> {
@@ -23,11 +37,9 @@ impl Analyzer for TestAnalyzer {
        1
    }

-    fn analyze_information_element(
-        &mut self,
-        ie: &InformationElement,
-        _packet_num: usize,
-    ) -> Option<Event> {
+    fn analyze_information_element(&mut self, ie: &InformationElement) -> Option<Event> {
+        self.packet_num += 1;
+
        if let InformationElement::LTE(lte_ie) = ie
            && let LteInformationElement::BcchDlSch(sch_msg) = &**lte_ie
            && let BCCH_DL_SCH_MessageType::C1(c1) = &sch_msg.message
@@ -38,32 +50,23 @@ impl Analyzer for TestAnalyzer {
                .cell_identity
                .0
                .as_bitslice()
-                .load_be::<u32>();
+                .load::<u32>();
            let plmn = &sib1.cell_access_related_info.plmn_identity_list.0;
            let mcc_string: String;

-            // MCC are always 3 digits
            if let Some(mcc) = &plmn[0].plmn_identity.mcc {
                mcc_string = format!("{}{}{}", mcc.0[0].0, mcc.0[1].0, mcc.0[2].0);
            } else {
                mcc_string = "nomcc".to_string();
            }
            let mnc = &plmn[0].plmn_identity.mnc;
-            let mnc_string: String;
-            // MNC can be 2 or 3 digits
-            if mnc.0.len() == 3 {
-                mnc_string = format!("{}{}{}", mnc.0[0].0, mnc.0[1].0, mnc.0[2].0);
-            } else if mnc.0.len() == 2 {
-                mnc_string = format!("{}{}", mnc.0[0].0, mnc.0[1].0);
-            } else {
-                mnc_string = format!("{:?}", mnc.0);
-            }
+            let mnc_string: String = format!("{}{}{}", mnc.0[0].0, mnc.0[1].0, mnc.0[2].0);

            return Some(Event {
                event_type: EventType::Low,
                message: format!(
-                    "SIB1 received CID: {}, PLMN: {}-{}",
-                    cid, mcc_string, mnc_string
+                    "SIB1 received (packet {}) CID: {}, PLMN: {}-{}",
+                    self.packet_num, cid, mcc_string, mnc_string
                ),
            });
        }
--- a/rootshell/Cargo.toml
+++ b/rootshell/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rootshell"
-version = "0.7.0"
+version = "0.6.1"
 edition = "2024"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
--- a/telcom-parser/Cargo.toml
+++ b/telcom-parser/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "telcom-parser"
-version = "0.7.0"
+version = "0.6.1"
 edition = "2024"

 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html