From fccb89b725555698e76a7ea120c3d8104cfa6805 Mon Sep 17 00:00:00 2001 From: Nilstrieb Date: Tue, 11 May 2021 15:09:21 +0200 Subject: [PATCH] better prints --- src/lib.rs | 4 +++- src/main.rs | 6 ++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 330b026..650dd2a 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -11,7 +11,7 @@ pub fn listen() -> StreamResult { println!("Listening on {}:8080", local_ipaddress::get().unwrap()); let listener = TcpListener::bind(("127.0.0.1", 8080))?; let stream = listener.incoming().next().unwrap()?; - println!("Connected. Waiting for response stream..."); + println!("Connected."); println!("other adress: {}", stream.peer_addr()?.ip()); Ok(stream) @@ -24,6 +24,7 @@ pub fn connect(address: String, port: String) -> StreamResult { let stream = TcpStream::connect((&*address, port))?; println!("Connected."); + println!("other adress: {}", stream.peer_addr()?.ip()); Ok(stream) } @@ -44,6 +45,7 @@ pub fn network_thread(mut stream: TcpStream, rx: Receiver) { } pub fn ui_thread(sx: Sender) { + println!("You can now write messages to your peer!"); loop { let input = input(); sx.send(input).expect("could not send value"); diff --git a/src/main.rs b/src/main.rs index fda4a66..b9114b6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -16,9 +16,9 @@ fn main() { Version 0.1" ); - println!("Do you want to listen(l) or connect(c) to a listener?"); + println!("Do you want to (l)isten or (c)onnect to a listener?"); - let result = if input().contains("l") { + let result = if input() == "l" { listen() } else { println!("Address: (empty for default)"); @@ -36,8 +36,6 @@ Version 0.1" match result { Ok(s) => { - println!("Successful connection established."); - let (sx, rx): (Sender, Receiver) = mpsc::channel(); let net = thread::spawn(move || {