From 75495dee384821a1b884beece11573c904a09e60 Mon Sep 17 00:00:00 2001 From: 5ec1cff Date: Tue, 12 Dec 2023 12:16:17 +0800 Subject: [PATCH] Indicate wrong root implementation --- zygiskd/src/zygiskd.rs | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/zygiskd/src/zygiskd.rs b/zygiskd/src/zygiskd.rs index 99efcda..ffa1586 100644 --- a/zygiskd/src/zygiskd.rs +++ b/zygiskd/src/zygiskd.rs @@ -41,13 +41,20 @@ pub fn main() -> Result<()> { let modules = load_modules(arch)?; { - let module_names: Vec<_> = modules.iter() - .map(|m| m.name.as_str()).collect(); - let module_info = format!("loaded {} module(s):{}", modules.len(), module_names.join(",")); let mut msg = Vec::::new(); msg.extend_from_slice(&constants::DAEMON_SET_INFO.to_le_bytes()); - msg.extend_from_slice(&(module_info.len() as u32 + 1).to_le_bytes()); - msg.extend_from_slice(module_info.as_bytes()); + let info = match root_impl::get_impl() { + root_impl::RootImpl::KernelSU | root_impl::RootImpl::Magisk => { + let module_names: Vec<_> = modules.iter() + .map(|m| m.name.as_str()).collect(); + format!("Root:{:?},module({}):{}", root_impl::get_impl(), modules.len(), module_names.join(",")) + } + _ => { + format!("Invalid root implementation: {:?}", root_impl::get_impl()) + } + }; + msg.extend_from_slice(&(info.len() as u32 + 1).to_le_bytes()); + msg.extend_from_slice(info.as_bytes()); msg.extend_from_slice(&[0u8]); utils::unix_datagram_sendto_abstract(controller_path.as_str(), msg.as_slice()).expect("failed to send info"); }