multi file for both sides

4 files changed, 46 insertions, 31 deletions

diff --git a/src/bin/server.rs b/src/bin/server/args.rs
index 215d2ae..31c0acc 100644
--- a/src/bin/server.rs
+++ b/src/bin/server/args.rs
@@ -1,24 +1,12 @@
-use std::io::{BufRead, BufReader, Write};
-use std::net::TcpListener;
-use std::thread;
-
-fn handle_client(stream: std::net::TcpStream) {
-    println!("Client connected");
-    let reader_stream = stream.try_clone().unwrap();
-    let reader = BufReader::new(reader_stream);
-    let mut writer = stream;
-    for line in reader.lines() {
-        let line = line.unwrap();
-        println!("Received: {}", line);
-        writeln!(writer, "{}", line).unwrap();
-    }
-    println!("Client disconnected");
+pub struct Args {
+    pub ip: String,
+    pub port: u16,
 }
 
-fn main() {
+pub fn parse_args() -> Args {
     let args: Vec<String> = std::env::args().collect();
     let mut ip = "127.0.0.1".to_string();
-    let mut port = 8080;
+    let mut port = 11525;
     let mut i = 1;
     while i < args.len() {
         if args[i] == "-p" {
@@ -49,18 +37,5 @@ fn main() {
             std::process::exit(1);
         }
     }
-    let listener = match TcpListener::bind(format!("{}:{}", ip, port)) {
-        Ok(l) => l,
-        Err(e) => {
-            eprintln!("Failed to bind to {}:{}: {}", ip, port, e);
-            std::process::exit(1);
-        }
-    };
-    println!("Server listening on {}", listener.local_addr().unwrap());
-    for stream in listener.incoming() {
-        let stream = stream.unwrap();
-        thread::spawn(move || {
-            handle_client(stream);
-        });
-    }
+    Args { ip, port }
 }
diff --git a/src/bin/server/handler.rs b/src/bin/server/handler.rs
new file mode 100644
index 0000000..906a91f
--- /dev/null
+++ b/src/bin/server/handler.rs
@@ -0,0 +1,15 @@
+use std::io::{BufRead, BufReader, Write};
+use std::net::TcpStream;
+
+pub fn handle_client(stream: TcpStream) {
+    println!("Client connected");
+    let reader_stream = stream.try_clone().unwrap();
+    let reader = BufReader::new(reader_stream);
+    let mut writer = stream;
+    for line in reader.lines() {
+        let line = line.unwrap();
+        println!("Received: {}", line);
+        writeln!(writer, "{}", line).unwrap();
+    }
+    println!("Client disconnected");
+}
diff --git a/src/bin/server/main.rs b/src/bin/server/main.rs
new file mode 100644
index 0000000..2c6e1dc
--- /dev/null
+++ b/src/bin/server/main.rs
@@ -0,0 +1,23 @@
+mod args;
+mod handler;
+
+use std::net::TcpListener;
+use std::thread;
+
+fn main() {
+    let args = args::parse_args();
+    let listener = match TcpListener::bind(format!("{}:{}", args.ip, args.port)) {
+        Ok(l) => l,
+        Err(e) => {
+            eprintln!("Failed to bind to {}:{}: {}", args.ip, args.port, e);
+            std::process::exit(1);
+        }
+    };
+    println!("Server listening on {}", listener.local_addr().unwrap());
+    for stream in listener.incoming() {
+        let stream = stream.unwrap();
+        thread::spawn(move || {
+            handler::handle_client(stream);
+        });
+    }
+}
diff --git a/src/bin/server/mod.rs b/src/bin/server/mod.rs
new file mode 100644
index 0000000..adb60bb
--- /dev/null
+++ b/src/bin/server/mod.rs
@@ -0,0 +1,2 @@
+pub mod args;
+pub mod handler;