X-Git-Url: http://git.euphorik.ch/?p=crypto_lab1.git;a=blobdiff_plain;f=src%2Fserver.rs;fp=src%2Fserver.rs;h=1ce5f955a80539cd115d5bf69e5caf6e04b0de35;hp=3eb1a465bbaba28bc6fd89b3314d394ce6404fb7;hb=3a33f82b92400ffabdc5fd7bdcbdc9f888277418;hpb=aee28ef5d1be59c0db218d7130fd1ae2314cc970 diff --git a/src/server.rs b/src/server.rs index 3eb1a46..1ce5f95 100644 --- a/src/server.rs +++ b/src/server.rs @@ -1,19 +1,17 @@ use std::io::{ TcpListener, TcpStream, Acceptor, Listener, IoError, IoResult }; use std::io::net::tcp::{ TcpAcceptor }; use command::{ Command, Packet, Error }; -use crypto::Crypto; pub struct Server { - acceptor: TcpAcceptor, - crypto: Crypto + acceptor: TcpAcceptor } impl Server { pub fn new(port: u16) -> IoResult { let mut acceptor = try!(TcpListener::bind("127.0.0.1", port).listen()); + let server = Server { - acceptor: acceptor.clone(), - crypto: Crypto::new() + acceptor: acceptor.clone() }; spawn(proc() { @@ -37,8 +35,9 @@ impl Server { } fn handle_client(mut stream: TcpStream) { - println!("new connection!"); + let mut current_timestamp = 0u64; + match Packet::read(&mut stream) { Ok(Command(packet)) => println!("CommandPacket"), Ok(Error(packet)) => println!("AnswerPacket"),