Read and writing of packet, work in progress.

[crypto_lab1.git] / src / server.rs

diff --git a/src/server.rs b/src/server.rs
index 3eb1a46..1ce5f95 100644 (file)
--- 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<Server> {
       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"),