1 files changed, 23 insertions, 9 deletions
diff --git a/examples/networking/echo_server.zc b/examples/networking/echo_server.zc
index 2934923..82ecd82 100644
--- a/examples/networking/echo_server.zc
+++ b/examples/networking/echo_server.zc
@@ -4,6 +4,7 @@ import "std/net.zc"
 def SIZE = 1024;
 
 fn main() {
+    setbuf(stdout, NULL);
     "Starting Echo Server on 127.0.0.1:8080...";
     
     let listener_res = TcpListener::bind("127.0.0.1", 8080);
@@ -13,24 +14,37 @@ fn main() {
     }
 
     let listener = listener_res.unwrap();
-    defer listener.close();
 
     loop {
         let client_res = listener.accept();
         if client_res.is_ok() {
             let stream = client_res.unwrap();
-            defer stream.close();
             
-            let buf = (char*)malloc(SIZE);
-            defer free(buf);
-            let read_res = stream.read(buf, SIZE);
+            "New Connection!";
             
-            if read_res.is_ok() {
+            let buf: char[SIZE];
+            
+            while true {
+                let read_res = stream.read(&buf[0], SIZE);
+                
+                if read_res.is_err() {
+                    !"Read error: {read_res.err}";
+                    break;
+                }
+                
                 let bytes = read_res.unwrap();
-                if bytes > 0 {
-                    stream.write(buf, bytes);
-                    "Echoed {bytes} bytes.";
+                if bytes == 0 {
+                    "Client disconnected.";
+                    break;
                 }
+                
+                let write_res = stream.write(&buf[0], bytes);
+                 if write_res.is_err() {
+                    !"Write error: {write_res.err}";
+                    break;
+                }
+
+                "Echoed {bytes} bytes.";
             }
         }
     }