From 3f5c1940b78d581ef310d6accd6477e6a3ae0072 Mon Sep 17 00:00:00 2001 From: alterdekim Date: Mon, 7 Oct 2024 19:15:48 +0300 Subject: [PATCH] modified: src/client.rs modified: src/main.rs deleted: src/simple_log.rs --- src/client.rs | 6 ------ src/main.rs | 1 - src/simple_log.rs | 49 ----------------------------------------------- 3 files changed, 56 deletions(-) delete mode 100644 src/simple_log.rs diff --git a/src/client.rs b/src/client.rs index 2848070..c417575 100644 --- a/src/client.rs +++ b/src/client.rs @@ -22,14 +22,8 @@ use crate::udp::{UDPVpnPacket, UDPVpnHandshake, UDPSerializable}; use network_interface::NetworkInterface; use network_interface::NetworkInterfaceConfig; use robusta_jni::jni::JNIEnv; -use crate::simple_log::SimpleLogger; - -static MY_LOGGER: SimpleLogger = SimpleLogger::new(); pub async fn client_mode(client_config: ClientConfiguration, fd: i32, env: &JNIEnv<'_>) { - MY_LOGGER.set_env(env); - log::set_logger(&MY_LOGGER).unwrap(); - info!("Starting client..."); let sock = UdpSocket::bind("0.0.0.0:25565").await.unwrap(); diff --git a/src/main.rs b/src/main.rs index b55c2df..82b6733 100644 --- a/src/main.rs +++ b/src/main.rs @@ -22,7 +22,6 @@ mod config; mod client; mod udp; mod mobile; -mod simple_log; /* #[no_mangle] diff --git a/src/simple_log.rs b/src/simple_log.rs deleted file mode 100644 index 869aa94..0000000 --- a/src/simple_log.rs +++ /dev/null @@ -1,49 +0,0 @@ -use crossbeam_channel::unbounded; -use crossbeam_channel::{ Sender, Receiver }; -use std::sync::LazyLock; -use robusta_jni::jni::JNIEnv; -use crate::jni::FridaLib; - -#[derive(Debug, Clone, PartialEq, Default)] -pub struct SimpleLogger<'a> { - env: Option<&'a JNIEnv> -} - -impl log::Log for SimpleLogger { - fn enabled(&self, metadata: &log::Metadata) -> bool { - metadata.level() <= log::Level::Trace - } - - fn log(&self, record: &log::Record) { - if self.enabled(record.metadata()) { - let current_crate_name = env!("CARGO_CRATE_NAME"); - if record.module_path().unwrap_or("").starts_with(current_crate_name) { - self.do_log(record); - } - } - } - - fn flush(&self) {} -} - -impl SimpleLogger { - pub fn new() -> Self { - SimpleLogger{env: None} - } - - fn do_log(&self, record: &log::Record) { - let timestamp: chrono::DateTime = chrono::Local::now(); - let msg = format!( - "[{} {:<5} {}] - {}", - timestamp.format("%Y-%m-%d %H:%M:%S"), - record.level(), - record.module_path().unwrap_or(""), - record.args() - ); - FridaLib::traceFromNative(self.env, msg); - } - - pub fn set_env(&self, env: &JNIEnv) { - self.env = Some(env); - } -} \ No newline at end of file