update etherparse

Author: Ruslan Iusupov

Cargo.lock

@@ -11,10 +11,10 @@ readme = "README.md"
 exclude = [".*", "rustfmt.toml"]
 
 [dependencies]
-etherparse = "0.13.0"
-indexmap = "2.2.6"
+etherparse = "0.16.0"
+indexmap = "2.6.0"
 
 [dev-dependencies]
-httparse = "1.9.4"
+httparse = "1.9.5"
 rand = "0.8.5"
 rpcap = "1.0.0"

Cargo.toml

@@ -44,7 +44,7 @@ fn parse_packet<'a>(captured_packet: &'a CapturedPacket<'a>) -> Option<(Ipv4Head
         eprintln!("Cannot parse IPv4 header");
         return None;
     };
-    if ipv4_header_slice.protocol() != IpNumber::Tcp as u8 {
+    if ipv4_header_slice.protocol() != IpNumber::TCP {
         return None;
     }
     let ipv4_header_size = ipv4_header_slice.slice().len();

examples/extract_http.rs

@@ -176,11 +176,10 @@ impl<'a> PcapTcpAssembler<'a> {
             /* trace */ Option<&str>,
         ),
     ) {
-        // TODO: Adapt to etherparse 0.15.0
-        // let Ok(ip_payload_len) = ipv4_header_slice.payload_len() else {
-        //     return;
-        // };
-        let tcp_segment_size: u32 = ipv4_header_slice.payload_len() as u32 - tcp_header_slice.data_offset() as u32 * 4;
+        let Ok(ip_payload_len) = ipv4_header_slice.payload_len() else {
+            return;
+        };
+        let tcp_segment_size: u32 = ip_payload_len as u32 - tcp_header_slice.data_offset() as u32 * 4;
         let with_payload =
             tcp_segment_size > 0 && (tcp_payload.len() as u32) >= tcp_segment_size && !tcp_header_slice.syn() && !tcp_header_slice.rst();
 

src/pcap_tcp_assembler.rs

@@ -21,7 +21,7 @@ fn generate_headers_buffers(sequence_number: u32, tcp_payload: &[u8]) -> (Vec<u8
     tcp_header_buf.extend_from_slice(&tcp_payload);
 
     let mut ipv4_header_buf = BufWriter::new(Vec::new());
-    let ipv4_header = Ipv4Header::new(tcp_header_buf.len() as u16, 64, IpNumber::Tcp as u8, [192, 168, 1, 1], [192, 168, 1, 2]);
+    let ipv4_header = Ipv4Header::new(tcp_header_buf.len() as u16, 64, IpNumber::TCP, [192, 168, 1, 1], [192, 168, 1, 2]).unwrap();
     ipv4_header.write(&mut ipv4_header_buf).unwrap();
     let ipv4_header_buf = ipv4_header_buf.into_inner().unwrap();
 
@@ -753,7 +753,7 @@ fn test_flags_rst() {
     let tcp_header_slice1 = TcpHeaderSlice::from_slice(&tcp_header_buf1).unwrap();
 
     let mut ipv4_header_buf1 = BufWriter::new(Vec::new());
-    let ipv4_header1 = Ipv4Header::new(tcp_header_buf1.len() as u16, 64, IpNumber::Tcp as u8, [192, 168, 1, 1], [192, 168, 1, 2]);
+    let ipv4_header1 = Ipv4Header::new(tcp_header_buf1.len() as u16, 64, IpNumber::TCP, [192, 168, 1, 1], [192, 168, 1, 2]).unwrap();
     ipv4_header1.write(&mut ipv4_header_buf1).unwrap();
     let ipv4_header_buf1 = ipv4_header_buf1.into_inner().unwrap();
     let ipv4_header_slice1 = Ipv4HeaderSlice::from_slice(&ipv4_header_buf1).unwrap();
@@ -786,7 +786,7 @@ fn test_flags_rst() {
     let tcp_header_slice2 = TcpHeaderSlice::from_slice(&tcp_header_buf2).unwrap();
 
     let mut ipv4_header_buf2 = BufWriter::new(Vec::new());
-    let ipv4_header2 = Ipv4Header::new(tcp_header_buf2.len() as u16, 64, IpNumber::Tcp as u8, [192, 168, 1, 2], [192, 168, 1, 1]);
+    let ipv4_header2 = Ipv4Header::new(tcp_header_buf2.len() as u16, 64, IpNumber::TCP, [192, 168, 1, 2], [192, 168, 1, 1]).unwrap();
     ipv4_header2.write(&mut ipv4_header_buf2).unwrap();
     let ipv4_header_buf2 = ipv4_header_buf2.into_inner().unwrap();
     let ipv4_header_slice2 = Ipv4HeaderSlice::from_slice(&ipv4_header_buf2).unwrap();
@@ -882,7 +882,7 @@ fn test_flags_syn() {
     let tcp_header_slice1 = TcpHeaderSlice::from_slice(&tcp_header_buf1).unwrap();
 
     let mut ipv4_header_buf1 = BufWriter::new(Vec::new());
-    let ipv4_header1 = Ipv4Header::new(tcp_header_buf1.len() as u16, 64, IpNumber::Tcp as u8, [192, 168, 1, 1], [192, 168, 1, 2]);
+    let ipv4_header1 = Ipv4Header::new(tcp_header_buf1.len() as u16, 64, IpNumber::TCP, [192, 168, 1, 1], [192, 168, 1, 2]).unwrap();
     ipv4_header1.write(&mut ipv4_header_buf1).unwrap();
     let ipv4_header_buf1 = ipv4_header_buf1.into_inner().unwrap();
     let ipv4_header_slice1 = Ipv4HeaderSlice::from_slice(&ipv4_header_buf1).unwrap();
@@ -915,7 +915,7 @@ fn test_flags_syn() {
     let tcp_header_slice2 = TcpHeaderSlice::from_slice(&tcp_header_buf2).unwrap();
 
     let mut ipv4_header_buf2 = BufWriter::new(Vec::new());
-    let ipv4_header2 = Ipv4Header::new(tcp_header_buf2.len() as u16, 64, IpNumber::Tcp as u8, [192, 168, 1, 2], [192, 168, 1, 1]);
+    let ipv4_header2 = Ipv4Header::new(tcp_header_buf2.len() as u16, 64, IpNumber::TCP, [192, 168, 1, 2], [192, 168, 1, 1]).unwrap();
     ipv4_header2.write(&mut ipv4_header_buf2).unwrap();
     let ipv4_header_buf2 = ipv4_header_buf2.into_inner().unwrap();
     let ipv4_header_slice2 = Ipv4HeaderSlice::from_slice(&ipv4_header_buf2).unwrap();
@@ -1011,7 +1011,7 @@ fn test_flags_fin() {
     let tcp_header_slice1 = TcpHeaderSlice::from_slice(&tcp_header_buf1).unwrap();
 
     let mut ipv4_header_buf1 = BufWriter::new(Vec::new());
-    let ipv4_header1 = Ipv4Header::new(tcp_header_buf1.len() as u16, 64, IpNumber::Tcp as u8, [192, 168, 1, 1], [192, 168, 1, 2]);
+    let ipv4_header1 = Ipv4Header::new(tcp_header_buf1.len() as u16, 64, IpNumber::TCP, [192, 168, 1, 1], [192, 168, 1, 2]).unwrap();
     ipv4_header1.write(&mut ipv4_header_buf1).unwrap();
     let ipv4_header_buf1 = ipv4_header_buf1.into_inner().unwrap();
     let ipv4_header_slice1 = Ipv4HeaderSlice::from_slice(&ipv4_header_buf1).unwrap();
@@ -1044,7 +1044,7 @@ fn test_flags_fin() {
     let tcp_header_slice2 = TcpHeaderSlice::from_slice(&tcp_header_buf2).unwrap();
 
     let mut ipv4_header_buf2 = BufWriter::new(Vec::new());
-    let ipv4_header2 = Ipv4Header::new(tcp_header_buf2.len() as u16, 64, IpNumber::Tcp as u8, [192, 168, 1, 2], [192, 168, 1, 1]);
+    let ipv4_header2 = Ipv4Header::new(tcp_header_buf2.len() as u16, 64, IpNumber::TCP, [192, 168, 1, 2], [192, 168, 1, 1]).unwrap();
     ipv4_header2.write(&mut ipv4_header_buf2).unwrap();
     let ipv4_header_buf2 = ipv4_header_buf2.into_inner().unwrap();
     let ipv4_header_slice2 = Ipv4HeaderSlice::from_slice(&ipv4_header_buf2).unwrap();