Data used for packet error has been modified.

[crypto_lab1.git] / src / end_point.rs

diff --git a/src/end_point.rs b/src/end_point.rs
index 6ed1fad..b44afc9 100644 (file)
--- a/src/end_point.rs
+++ b/src/end_point.rs
@@ -4,6 +4,7 @@ use std::io::net::tcp::{ TcpAcceptor, TcpListener };
 use packet;
 use packet::{ Packet, Command, Answer, Error, ReadingResult, PacketType };
 
+// Default timeout when waiting data on a stream (for instance: 'TcpStream::read').
 static DEFAULT_TIMEOUT: Option<u64> = Some(500); // [ms].
 
 pub struct Server {
@@ -105,6 +106,7 @@ impl Client {
    }
 
    /// Send some valid and not-valid packets to the server and check the result.
+   /// For each test a new client is created.
    pub fn start_tests(address: &str, port: u16) {
       let execute = |f: &mut |&mut Client| -> bool| -> bool {
          match Client::new(address, port) {
@@ -125,8 +127,9 @@ impl Client {
       }
 
       let mut tests = vec!(
+         // 1)
          |client: &mut Client| -> bool {
-            println!("Send a valid packet...");
+            println!("Sending a valid packet...");
             match client.end_point.send_with_result(Command(Packet::random_packet_data([42]))) {
                Ok(Ok(Packet { t: Answer(..), .. })) => true,
                other => {
@@ -135,9 +138,9 @@ impl Client {
                }
             }
          },
-
+         // 2)
          |client: &mut Client| -> bool {
-            println!("Send a packet with an unknown type...");
+            println!("Sending a packet with an unknown type...");
             client.end_point.current_timestamp += 1;
             let mut raw_packet = raw_packet(client.end_point.current_timestamp);
             raw_packet[2] = 0xEE; // Alter the type.
@@ -149,9 +152,9 @@ impl Client {
                }
             }
          },
-
+         // 3)
          |client: &mut Client| -> bool {
-            println!("Send a packet with an old timestamp...");
+            println!("Sending a packet with an old timestamp...");
             client.end_point.current_timestamp += 1;
             let raw_packet = raw_packet(0);
             match client.end_point.send_raw_with_result(raw_packet.as_slice()) {
@@ -162,9 +165,9 @@ impl Client {
                }
             }
          },
-
+         // 4)
          |client: &mut Client| -> bool {
-            println!("Send a packet with altered crypted data...");
+            println!("Sending a packet with altered crypted data (do not alter the padding)...");
             client.end_point.current_timestamp += 1;
             let mut raw_packet = raw_packet(client.end_point.current_timestamp);
             raw_packet[11] = 0xDE;
@@ -179,9 +182,9 @@ impl Client {
                }
             }
          },
-
+         // 5)
          |client: &mut Client| -> bool {
-            println!("Send a packet with too small data...");
+            println!("Sending a packet with too small data...");
             let command = Command(Packet::new_packet_data(0, Vec::from_elem(6, 0x00)));
             match client.end_point.send_with_result(command) {
                Ok(Err(packet::IOReadError( IoError { kind: io::TimedOut, .. }))) => true, // OK: the server should not send any packet.
@@ -191,9 +194,9 @@ impl Client {
                }
             }
          },
-
+         // 6)
          |client: &mut Client| -> bool {
-            println!("Send a packet with too large data...");
+            println!("Sending a packet with too large data...");
             let command = Command(Packet::new_packet_data(0, Vec::from_elem(40, 0x00)));
             match client.end_point.send_with_result(command) {
                Ok(Err(packet::IOReadError( IoError { kind: io::TimedOut, .. }))) => true, // OK: the server should not send any packet.
@@ -203,9 +206,9 @@ impl Client {
                }
             }
          },
-
+         // 7)
          |client: &mut Client| -> bool {
-            println!("Send a packet with wrong padding...");
+            println!("Sending a packet with wrong padding (all 0)...");
             client.end_point.current_timestamp += 1;
             let mut m = MemWriter::new();
             let raw_packet = match (Packet { t: Command(Packet::random_packet_data([42])), timestamp: client.end_point.current_timestamp }).write_with_padding_fun(&mut m, |_, _| -> u8 { 0 }) {