Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/bin/client.rs

src/bin/client.rs

@@ -1,12 +1,12 @@
+use std::io::Write;
 use std::net::TcpStream;
 
 fn main() {
-    let stream = TcpStream::connect("127.0.0.1:8080");
+    //let stream = TcpStream::connect("172.30.16.1:8080");
-    if stream.is_ok() {
+    //let stream = TcpStream::connect("27.0.0.1:8080");
-        println!("Connected to the server!");
+    match TcpStream::connect("localhost:3333") {
-    } else {
+        Ok(mut stream) => {
-        println!("Couldn't connect to server...");
+            println!("Successfully connected to server");
-    }
 
             loop {
                 let mut buffer = String::new();
@@ -15,7 +15,9 @@ fn main() {
                 if n == 0 {
                     break;
                 }
-                println!("{}", buffer);
+                        println!("Sending {}", buffer);
+                        stream.write(buffer.as_bytes()).unwrap();
+                        println!("Sent {}, awaiting reply...", buffer);
                     }
                     Err(error) => {
                         println!("error: {error}");
@@ -23,4 +25,10 @@ fn main() {
                     }
                 }
             }
+        },
+        Err(e) => {
+            println!("Failed to connect: {}", e);
+        }
+    }
+    println!("Terminated.");
 } // the stream is closed here