diff --git a/sparse-05/sparse-05-client/src/commands/connect/commands/sysinfo.rs b/sparse-05/sparse-05-client/src/commands/connect/commands/sysinfo.rs index 827ecff..b64e3ea 100644 --- a/sparse-05/sparse-05-client/src/commands/connect/commands/sysinfo.rs +++ b/sparse-05/sparse-05-client/src/commands/connect/commands/sysinfo.rs @@ -1,6 +1,8 @@ +use std::net::IpAddr; + use sparse_05_common::messages::{Capabilities, OperatingSystem}; -pub fn print_capabilities(capabilities: &Capabilities) { +pub fn print_capabilities(capabilities: &Capabilities, ip: &IpAddr) { use ansi_term::Colour as Color; println!("Capabilities of remote host:"); @@ -65,7 +67,8 @@ pub fn print_capabilities(capabilities: &Capabilities) { } println!("\tTransport type: \t{:?}", capabilities.transport); println!( - "\tHost name: \t\t{}", - capabilities.hostname.as_deref().unwrap_or("") + "\tHost name (IP): \t{} ({})", + capabilities.hostname.as_deref().unwrap_or(""), + ip.ip() ); } diff --git a/sparse-05/sparse-05-client/src/commands/connect/shell.rs b/sparse-05/sparse-05-client/src/commands/connect/shell.rs index 327c1f7..aef88aa 100644 --- a/sparse-05/sparse-05-client/src/commands/connect/shell.rs +++ b/sparse-05/sparse-05-client/src/commands/connect/shell.rs @@ -88,7 +88,7 @@ pub(super) async fn shell( cmd_matcher!( cmd[..amount], (_sysinfo, b"#sysinfo") => { - commands::sysinfo::print_capabilities(&capabilities) + commands::sysinfo::print_capabilities(&capabilities, &connection.ip.ip()) }, (_help, b"#help") => {}, (_exit, b"#exit") => { diff --git a/sparse-05/sparse-05-server/src/connection.rs b/sparse-05/sparse-05-server/src/connection.rs index 4ce2f92..4b3b21f 100644 --- a/sparse-05/sparse-05-server/src/connection.rs +++ b/sparse-05/sparse-05-server/src/connection.rs @@ -223,6 +223,10 @@ fn handle_full_connection( where F: Fn(), { + loop { + let msg = packet_handler.recv()?; + } + close(); Ok(())