From 62c810b6f8ef7c3feca62637b8361a3386fa43d8 Mon Sep 17 00:00:00 2001 From: troido Date: Mon, 23 Sep 2019 09:18:42 +0200 Subject: picking up the project again. Not sure what I changed, but it seemed wise to commit --- src/main.rs | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'src/main.rs') diff --git a/src/main.rs b/src/main.rs index ff60460..a9cd76b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -3,25 +3,32 @@ use std::thread::sleep; use std::time::Duration; use std::path::Path; +// use std::net::SocketAddr; pub mod server; pub mod gameserver; +pub mod simpleworld; use self::gameserver::GameServer; use self::server::unixserver::UnixServer; +use self::server::tcpserver::TcpServer; +use self::server::Server; fn main() { -// let addr = "127.0.0.1:1234".parse().unwrap(); let addr = Path::new("\0rustifarm"); + let unixserver = UnixServer::new(&addr).expect("binding unix server failed"); - let socketserver = UnixServer::new(&addr).expect("binding server failed"); + let addr = "127.0.0.1:1234".parse().unwrap(); + let inetserver = TcpServer::new(&addr).expect("binding inet server failed"); - let mut gameserver = GameServer::new(socketserver); - println!("listening on {:?}", addr); + let servers: Vec> = vec![Box::new(unixserver), Box::new(inetserver)]; + let mut gameserver = GameServer::new(servers); + +// println!("listening on {:?}", addr); // let mut players: HashMap = HashMap::new(); -- cgit