rusty-gd: Add btsnoop config (205e4aa1) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/rust/common/src/sys_prop.rs

+27 −0

Original line number	Diff line number	Diff line
		@@ -27,3 +27,30 @@ pub fn get(name: &str) -> Option<String> {
		pub fn get(_name: &str) -> Option<String> {
		None
		}

		/// Gets the specified property as a u32
		pub fn get_u32(name: &str) -> Option<u32> {
		if let Some(value) = get(name) {
		value.parse().ok()
		} else {
		None
		}
		}

		/// Gets the specified property as a bool (logic follows libcutils/properties.cpp)
		pub fn get_bool(name: &str) -> Option<bool> {
		if let Some(value) = get(name) {
		match value.as_str() {
		"0" \| "n" \| "no" \| "false" \| "off" => Some(false),
		"1" \| "y" \| "yes" \| "true" \| "on" => Some(true),
		_ => None
		}
		} else {
		None
		}
		}

		/// Gets whether the current build is debuggable
		pub fn get_debuggable() -> bool {
		get_bool("ro.debuggable").unwrap_or(false)
		}

system/gd/rust/facade/src/lib.rs

+4 −2

Original line number	Diff line number	Diff line
		@@ -35,10 +35,11 @@ impl RootFacadeService {
		rt: Arc<Runtime>,
		grpc_port: u16,
		rootcanal_port: Option<u16>,
		snoop_path: Option<String>,
		) -> grpcio::Service {
		create_root_facade(Self {
		rt: rt.clone(),
		manager: FacadeServiceManager::create(rt, grpc_port, rootcanal_port),
		manager: FacadeServiceManager::create(rt, grpc_port, rootcanal_port, snoop_path),
		})
		}
		}
		@@ -121,7 +122,7 @@ impl FacadeServer {
		type Result<T> = std::result::Result<T, Box<dyn std::error::Error + Send + Sync>>;

		impl FacadeServiceManager {
		fn create(rt: Arc<Runtime>, grpc_port: u16, rootcanal_port: Option<u16>) -> Self {
		fn create(rt: Arc<Runtime>, grpc_port: u16, rootcanal_port: Option<u16>, snoop_path: Option<String>) -> Self {
		let (tx, mut rx) = channel::<LifecycleCommand>(1);
		let local_rt = rt.clone();
		rt.spawn(async move {
		@@ -131,6 +132,7 @@ impl FacadeServiceManager {
		LifecycleCommand::Start { req, done } => {
		let stack = Stack::new(local_rt.clone()).await;
		stack.set_rootcanal_port(rootcanal_port).await;
		stack.configure_snoop(snoop_path.clone()).await;
		server = Some(FacadeServer::start(stack, req, grpc_port).await);
		done.send(()).unwrap();
		}

system/gd/rust/facade/src/main.rs

+7 −3

Original line number	Diff line number	Diff line
		@@ -12,12 +12,12 @@ use futures::channel::mpsc;
		use futures::executor::block_on;
		use futures::stream::StreamExt;
		use grpcio::*;
		use log::debug;
		use nix::sys::signal;
		use std::net::{IpAddr, Ipv4Addr, Shutdown, SocketAddr};
		use std::sync::{Arc, Mutex};
		use tokio::net::TcpStream;
		use tokio::runtime::Runtime;
		use log::debug;

		fn main() {
		let sigint = install_sigint();
		@@ -64,10 +64,14 @@ async fn async_main(rt: Arc<Runtime>, mut sigint: mpsc::UnboundedReceiver<()>) {
		let grpc_port = value_t!(matches, "grpc-port", u16).unwrap();
		let signal_port = value_t!(matches, "signal-port", u16).unwrap();
		let rootcanal_port = value_t!(matches, "rootcanal-port", u16).ok();

		let env = Arc::new(Environment::new(2));
		let mut server = ServerBuilder::new(env)
		.register_service(RootFacadeService::create(rt, grpc_port, rootcanal_port))
		.register_service(RootFacadeService::create(
		rt,
		grpc_port,
		rootcanal_port,
		matches.value_of("btsnoop").map(String::from),
		))
		.bind("0.0.0.0", root_server_port)
		.build()
		.unwrap();

system/gd/rust/hal/src/lib.rs

+1 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@ extern crate lazy_static;

		pub mod facade;
		pub mod rootcanal_hal;
		pub mod snoop;

		#[cfg(target_os = "android")]
		mod hidl_hal;

system/gd/rust/hal/src/snoop.rs

0 → 100644

+77 −0

Original line number	Diff line number	Diff line
		//! BT snoop logger

		use bt_common::sys_prop;
		use gddi::Stoppable;

		/// The different modes snoop logging can be in
		#[derive(Clone)]
		pub enum SnoopMode {
		/// All logs disabled
		Disabled,
		/// Only sanitized logs
		Filtered,
		/// Log everything
		Full,
		}

		/// There was an error parsing the mode from a string
		pub struct SnoopModeParseError;

		impl std::str::FromStr for SnoopMode {
		type Err = SnoopModeParseError;

		fn from_str(s: &str) -> Result<Self, Self::Err> {
		match s {
		"disabled" => Ok(SnoopMode::Disabled),
		"filtered" => Ok(SnoopMode::Filtered),
		"full" => Ok(SnoopMode::Full),
		_ => Err(SnoopModeParseError),
		}
		}
		}

		/// All snoop logging config
		#[derive(Clone, Stoppable)]
		pub struct SnoopConfig {
		path: String,
		max_packets_per_file: u32,
		mode: SnoopMode,
		}

		impl SnoopConfig {
		/// Constructs a new snoop config
		pub fn new() -> Self {
		Self {
		path: "/data/misc/bluetooth/logs/btsnoop_hci.log".to_string(),
		max_packets_per_file: sys_prop::get_u32("persist.bluetooth.btsnoopsize")
		.unwrap_or(0xFFFF),
		mode: get_configured_snoop_mode()
		.parse()
		.unwrap_or(SnoopMode::Disabled),
		}
		}

		/// Overwrites the laoded log path with the provided one
		pub fn set_path(&mut self, value: String) {
		self.path = value;
		}

		/// Overwrites the loaded mode with the provided one
		pub fn set_mode(&mut self, value: SnoopMode) {
		self.mode = value;
		}
		}

		impl Default for SnoopConfig {
		fn default() -> Self {
		Self::new()
		}
		}

		fn get_configured_snoop_mode() -> String {
		sys_prop::get("persist.bluetooth.btsnooplogmode").unwrap_or(if sys_prop::get_debuggable() {
		sys_prop::get("persist.bluetooth.btsnoopdefaultmode").unwrap_or_default()
		} else {
		String::default()
		})
		}