bumped versions and added the actual shutdown

Author: sidit77

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "inputshare-client"
-version = "2.2.1"
+version = "2.3.0"
 authors = ["sidit77 <sidit77@gmail.com>"]
 edition = "2018"
 build = "build.rs"

inputshare-client/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "inputshare-server"
-version = "2.3.1"
+version = "2.3.0"
 authors = ["sidit77 <sidit77@gmail.com>"]
 edition = "2018"
 
@@ -16,5 +16,6 @@ byteorder = "1"
 vec_map = "0.8.2"
 bitflags = "1.3"
 clap = { version = "3.0", features = ["derive"] }
+system_shutdown = "3.0"
 inputshare-common = { path = "../lib/inputshare-common" }
 udp_connections = {git = "https://github.com/sidit77/udp_connections.git"}

inputshare-server/Cargo.toml

@@ -14,6 +14,7 @@ use clap::Parser;
 use log::LevelFilter;
 use mio::net::UdpSocket;
 use mio_signals::{Signal, Signals, SignalSet};
+use system_shutdown::shutdown;
 use udp_connections::{MAX_PACKET_SIZE, Server, ServerEvent, Transport};
 use vec_map::VecMap;
 use inputshare_common::{ConsumerDeviceCode, HidButtonCode, HidKeyCode, IDENTIFIER};
@@ -53,10 +54,15 @@ fn main() -> Result<()>{
 
     configfs::disable_hid()?;
 
-    result
+    if result? {
+        log::info!("Attempting the shutdown the OS as well...");
+        shutdown()?;
+    }
+
+    Ok(())
 }
 
-fn server(args: Args) -> Result<()> {
+fn server(args: Args) -> Result<bool> {
     log::info!("Opening HID devices");
 
     let mut mouse = Mouse::new(args.mouse_tesselation_factor.try_into()?)?;
@@ -77,6 +83,7 @@ fn server(args: Args) -> Result<()> {
 
     log::info!("Started server on {}", socket.local_addr()?);
 
+    let mut shutdown_raspberry = false;
     let mut last_input = Instant::now();
     let mut idle_move_x = -10;
     let mut receivers = VecMap::new();
@@ -155,7 +162,10 @@ fn server(args: Args) -> Result<()> {
                                         mouse.reset()?;
                                         consumer_device.reset()?;
                                     },
-                                    InputEvent::Shutdown => log::info!("Shutdown")
+                                    InputEvent::Shutdown => {
+                                        shutdown_raspberry = true;
+                                        break 'outer;
+                                    }
                                 }
                                 last_input = Instant::now();
                                 // println!("{:?}", event);
@@ -185,7 +195,7 @@ fn server(args: Args) -> Result<()> {
 
     log::info!("Shutting down");
 
-    Ok(())
+    Ok(shutdown_raspberry)
 }
 
 struct MioSocket(UdpSocket);

inputshare-server/src/main.rs

@@ -1,6 +1,6 @@
 [package]
 name = "inputshare-common"
-version = "2.0.0"
+version = "2.1.0"
 authors = ["sidit77 <sidit77@gmail.com>"]
 edition = "2018"