logging for the server

Author: sidit77

Cargo.lock

@@ -7,6 +7,8 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+log = "0.4.17"
+env_logger = "0.9.0"
 anyhow = "1.0"
 mio = {version = "0.8", features = ["os-poll", "net"]}
 mio-signals = "0.2.0"

inputshare-server/Cargo.toml

@@ -106,7 +106,7 @@ const CONSUMER_REPORT_DESC: &[u8] = &[
 ];
 
 pub fn enable_hid() -> Result<()>{
-    println!("Enabling HID device");
+    log::info!("Enabling HID device");
 
     env::set_current_dir("/sys/kernel/config/usb_gadget/")?;
     fs::create_dir("g1")?;
@@ -174,7 +174,7 @@ pub fn enable_hid() -> Result<()>{
 }
 
 pub fn disable_hid() -> Result<()>{
-    println!("Disabling HID device");
+    log::info!("Disabling HID device");
 
     env::set_current_dir("/sys/kernel/config/usb_gadget/g1/")?;
 

inputshare-server/src/configfs.rs

@@ -11,6 +11,7 @@ use std::time::{Duration, Instant};
 use mio::{Events, Interest, Poll, Token};
 use anyhow::Result;
 use clap::Parser;
+use log::LevelFilter;
 use mio::net::UdpSocket;
 use mio_signals::{Signal, Signals, SignalSet};
 use udp_connections::{MAX_PACKET_SIZE, Server, ServerEvent, Transport};
@@ -37,6 +38,13 @@ struct Args {
 }
 
 fn main() -> Result<()>{
+    env_logger::builder()
+        .filter_level(LevelFilter::Info)
+        .format_timestamp(None)
+        //.format_target(false)
+        .parse_default_env()
+        .init();
+
     let args = Args::parse();
 
     configfs::enable_hid()?;
@@ -49,7 +57,7 @@ fn main() -> Result<()>{
 }
 
 fn server(args: Args) -> Result<()> {
-    println!("Opening HID devices");
+    log::info!("Opening HID devices");
 
     let mut mouse = Mouse::new(args.mouse_tesselation_factor.try_into()?)?;
     let mut keyboard = Keyboard::new()?;
@@ -67,7 +75,7 @@ fn server(args: Args) -> Result<()> {
     poll.registry().register(&mut socket, SERVER, Interest::READABLE)?;
     let mut socket = Server::new(MioSocket::from(socket), IDENTIFIER, 1);
 
-    println!("Started server on {}", socket.local_addr()?);
+    log::info!("Started server on {}", socket.local_addr()?);
 
     let mut last_input = Instant::now();
     let mut idle_move_x = -10;
@@ -81,6 +89,7 @@ fn server(args: Args) -> Result<()> {
         if let Some(secs) = args.auto_movement_timeout {
             let mut remaining = (last_input + Duration::from_secs(secs)).saturating_duration_since(Instant::now());
             if remaining.is_zero() {
+                log::debug!("Time is move -> moving mouse");
                 mouse.move_by(idle_move_x, 0)?;
                 idle_move_x *= -1;
                 last_input = Instant::now();
@@ -114,11 +123,11 @@ fn server(args: Args) -> Result<()> {
             match socket.next_event(&mut buffer) {
                 Ok(Some(event)) => match event {
                     ServerEvent::ClientConnected(client_id) => {
-                        println!("Client {} connected", client_id);
+                        log::info!("Client {} connected", client_id);
                         receivers.insert(client_id.into(), InputReceiver::new());
                     },
                     ServerEvent::ClientDisconnected(client_id, reason) => {
-                        println!("Client {} disconnected: {:?}", client_id, reason);
+                        log::info!("Client {} disconnected: {:?}", client_id, reason);
                         mouse.reset()?;
                         keyboard.reset()?;
                         consumer_device.reset()?;
@@ -130,6 +139,7 @@ fn server(args: Args) -> Result<()> {
                                 socket.send(client_id, packet).unwrap_or_default();
                             }
                             while let Some(event) = receiver.get_event() {
+                                log::trace!("Network packet: {:?}", event);
                                 match event {
                                     InputEvent::MouseMove(x, y) => mouse.move_by(x as i16, y as i16)?,
                                     InputEvent::KeyPress(key) => keyboard.press_key(key)?,
@@ -156,7 +166,7 @@ fn server(args: Args) -> Result<()> {
                 }
                 Ok(None) => break,
                 Err(e) => {
-                    println!("Receive error: {}", e);
+                    log::info!("Receive error: {}", e);
                     break;
                 }
             }
@@ -172,7 +182,7 @@ fn server(args: Args) -> Result<()> {
         socket.disconnect(client).unwrap();
     }
 
-    println!("Shutting down");
+    log::info!("Shutting down");
 
     Ok(())
 }
@@ -230,7 +240,7 @@ impl Keyboard {
         for (i, key) in self.pressed_keys.iter().enumerate().take(6) {
             report[2 + i] = (*key).into()
         }
-
+        log::trace!("Wring keyboard report: {:?}", &report);
         self.device.write_all(&report)
     }
 
@@ -275,6 +285,7 @@ impl ConsumerDevice {
     }
 
     fn send_report(&mut self) -> std::io::Result<()> {
+        log::trace!("Wring consumer device report: {:?}", &self.pressed_keys.bits().to_le_bytes());
         self.device.write_all(&self.pressed_keys.bits().to_le_bytes())
     }
 
@@ -332,6 +343,7 @@ impl Mouse {
         report[5..=5].copy_from_slice(&dv.to_le_bytes());
         report[6..=6].copy_from_slice(&dh.to_le_bytes());
 
+        log::trace!("Wring mouse report: {:?}", &report);
         self.device.write_all(&report)
     }
 

inputshare-server/src/main.rs

@@ -70,7 +70,7 @@ impl InputReceiver {
                 Ok(MessageType::HorizontalScrolling) => self.events.push_back(InputEvent::HorizontalScrolling(msg_arg as i8)),
                 Ok(MessageType::VerticalScrolling) => self.events.push_back(InputEvent::VerticalScrolling(msg_arg as i8)),
                 Ok(MessageType::Reset) => self.events.push_back(InputEvent::Reset),
-                Err(e) => println!("Invalid message: {}", e)
+                Err(e) => log::warn!("Invalid message: {}", e)
             }
             self.last_message = start_message + i + 1;
         }