Merge pull request #5 from courvoif/add_endianness_tests

Add endianness tests

src/lib.rs

@@ -37,7 +37,7 @@ mod packet;
 pub use packet::{Packet, PacketHeader};
 
 mod pcap_header;
-pub use pcap_header::{DataLink, PcapHeader};
+pub use pcap_header::{DataLink, PcapHeader, Endianness};
 
 pub mod peek_reader;
 

src/packet.rs

@@ -9,7 +9,7 @@ use byteorder::*;
 use errors::*;
 
 /// Describes a pcap packet header.
-#[derive(Copy, Clone, Default, Debug)]
+#[derive(Copy, Clone, Default, Debug, Eq, PartialEq)]
 pub struct PacketHeader {
 
     /// Timestamp in seconds

src/pcap_header.rs

@@ -7,7 +7,7 @@ use byteorder::*;
 use errors::*;
 
 /// Struct that represents the global Pcap header of a Pcap file
-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq)]
 pub struct PcapHeader {
 
     /// Magic number
@@ -151,22 +151,22 @@ impl PcapHeader {
 }
 
 /// Represents the endianness of the global header
-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq)]
 pub enum Endianness {
     Big,
     Little
 }
 
 /// Represents each possible timestamp resolution of the global header
-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq)]
 pub enum TsResolution {
     MicroSecond,
     NanoSecond
 }
 
 /// Represents each possible Pcap datalink
 #[allow(non_camel_case_types)]
-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone, Debug, Eq, PartialEq)]
 pub enum DataLink {
 
     NULL,

tests/read_write.rs

@@ -2,7 +2,7 @@ extern crate pcap_file;
 
 use pcap_file::{PcapReader, PcapWriter};
 
-static DATA: &'static[u8; 1455] = include_bytes!("test_in.pcap");
+static DATA: &'static[u8; 1455] = include_bytes!("little_endian.pcap");
 
 #[test]
 fn read() {
@@ -39,4 +39,68 @@ fn read_write() {
     out = pcap_writer.into_writer();
 
     assert_eq!(&DATA[..], &out[..]);
+}
+
+#[test]
+fn big_endian() {
+
+    let data  = include_bytes!("big_endian.pcap");
+
+    //Global header test
+    let mut pcap_reader = PcapReader::new(&data[..]).unwrap();
+    let header = pcap_file::PcapHeader {
+        magic_number: 0xa1b2c3d4,
+        version_major: 2,
+        version_minor: 4,
+        ts_correction: 0,
+        ts_accuracy: 0,
+        snaplen: 0xffff,
+        datalink: pcap_file::DataLink::ETHERNET,
+    };
+
+    assert_eq!(pcap_reader.header, header);
+    assert_eq!(pcap_reader.header.endianness(), pcap_file::Endianness::Big);
+
+    //Packet header test
+    let packet = pcap_reader.next().unwrap().unwrap();
+    let pkt_hdr = pcap_file::PacketHeader {
+        ts_sec: 0x4fa11b29,
+        ts_usec: 0x00025436,
+        incl_len: 0x62,
+        orig_len: 0x62,
+    };
+
+    assert_eq!(packet.header, pkt_hdr);
+}
+
+#[test]
+fn little_endian() {
+
+    let data  = include_bytes!("little_endian.pcap");
+
+    //Global header test
+    let mut pcap_reader = PcapReader::new(&data[..]).unwrap();
+    let header = pcap_file::PcapHeader {
+        magic_number: 0xd4c3b2a1,
+        version_major: 2,
+        version_minor: 4,
+        ts_correction: 0,
+        ts_accuracy: 0,
+        snaplen: 0x1000,
+        datalink: pcap_file::DataLink::ETHERNET,
+    };
+
+    assert_eq!(pcap_reader.header, header);
+    assert_eq!(pcap_reader.header.endianness(), pcap_file::Endianness::Little);
+
+    //Packet header test
+    let packet = pcap_reader.next().unwrap().unwrap();
+    let pkt_hdr = pcap_file::PacketHeader {
+        ts_sec: 0x4f633248,
+        ts_usec: 0x0,
+        incl_len: 0x75,
+        orig_len: 0x75,
+    };
+
+    assert_eq!(packet.header, pkt_hdr);
 }