modified: src/client.rs
All checks were successful
gitea/Frida-android-native/pipeline/head This commit looks good
All checks were successful
gitea/Frida-android-native/pipeline/head This commit looks good
modified: src/main.rs deleted: src/simple_log.rs
This commit is contained in:
parent
f669613b0e
commit
3f5c1940b7
@ -22,14 +22,8 @@ use crate::udp::{UDPVpnPacket, UDPVpnHandshake, UDPSerializable};
|
|||||||
use network_interface::NetworkInterface;
|
use network_interface::NetworkInterface;
|
||||||
use network_interface::NetworkInterfaceConfig;
|
use network_interface::NetworkInterfaceConfig;
|
||||||
use robusta_jni::jni::JNIEnv;
|
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<'_>) {
|
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...");
|
info!("Starting client...");
|
||||||
|
|
||||||
let sock = UdpSocket::bind("0.0.0.0:25565").await.unwrap();
|
let sock = UdpSocket::bind("0.0.0.0:25565").await.unwrap();
|
||||||
|
@ -22,7 +22,6 @@ mod config;
|
|||||||
mod client;
|
mod client;
|
||||||
mod udp;
|
mod udp;
|
||||||
mod mobile;
|
mod mobile;
|
||||||
mod simple_log;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
#[no_mangle]
|
#[no_mangle]
|
||||||
|
@ -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> = 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);
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
x
Reference in New Issue
Block a user