mitm: adjust for e4dec96

Author: manio

src/mitm.rs

@@ -27,8 +27,8 @@ use protobuf::text_format::print_to_string_pretty;
 use protobuf::{Enum, Message, MessageDyn};
 use protos::ControlMessageType::{self, *};
 
+use crate::config::AppConfig;
 use crate::config::HexdumpLevel;
-use crate::config::SharedConfig;
 use crate::ev::RestContext;
 use crate::io_uring::Endpoint;
 use crate::io_uring::IoDevice;
@@ -651,20 +651,11 @@ pub async fn proxy<A: Endpoint<A> + 'static>(
     tx: Sender<Packet>,
     mut rx: Receiver<Packet>,
     mut rxr: Receiver<Packet>,
-    config: SharedConfig,
+    config: AppConfig,
     rest_ctx: Option<Arc<tokio::sync::Mutex<RestContext>>>,
 ) -> Result<()> {
-    // load needed config options to local variables
-    let passthrough = !config.read().await.mitm;
-    let hex_requested = config.read().await.hexdump_level;
-    let dpi = config.read().await.dpi;
-    let developer_mode = config.read().await.developer_mode;
-    let disable_media_sink = config.read().await.disable_media_sink;
-    let disable_tts_sink = config.read().await.disable_tts_sink;
-    let remove_tap_restriction = config.read().await.remove_tap_restriction;
-    let video_in_motion = config.read().await.video_in_motion;
-    let ev = config.read().await.ev;
-    let ev_battery_logger = &config.read().await.ev_battery_logger;
+    let passthrough = !config.mitm;
+    let hex_requested = config.hexdump_level;
 
     // in full_frames/passthrough mode we only directly pass packets from one endpoint to the other
     if passthrough {
@@ -799,16 +790,16 @@ pub async fn proxy<A: Endpoint<A> + 'static>(
             let handled = pkt_modify_hook(
                 proxy_type,
                 &mut pkt,
-                dpi,
-                developer_mode,
-                disable_media_sink,
-                disable_tts_sink,
-                remove_tap_restriction,
-                video_in_motion,
-                ev,
+                config.dpi,
+                config.developer_mode,
+                config.disable_media_sink,
+                config.disable_tts_sink,
+                config.remove_tap_restriction,
+                config.video_in_motion,
+                config.ev,
                 &mut ctx,
                 rest_ctx.clone(),
-                ev_battery_logger.clone(),
+                config.ev_battery_logger.clone(),
             )
             .await?;
             let _ = pkt_debug(
@@ -844,16 +835,16 @@ pub async fn proxy<A: Endpoint<A> + 'static>(
                     let _ = pkt_modify_hook(
                         proxy_type,
                         &mut pkt,
-                        dpi,
-                        developer_mode,
-                        disable_media_sink,
-                        disable_tts_sink,
-                        remove_tap_restriction,
-                        video_in_motion,
-                        ev,
+                        config.dpi,
+                        config.developer_mode,
+                        config.disable_media_sink,
+                        config.disable_tts_sink,
+                        config.remove_tap_restriction,
+                        config.video_in_motion,
+                        config.ev,
                         &mut ctx,
                         rest_ctx.clone(),
-                        ev_battery_logger.clone(),
+                        config.ev_battery_logger.clone(),
                     )
                     .await?;
                     let _ = pkt_debug(