优化包解析

vnt-dev · Jul 26, 2023 · 4a603f4 · 4a603f4
1 parent 31a6361
commit 4a603f4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 38 deletions.
diff --git a/packet/src/error.rs b/packet/src/error.rs
diff --git a/packet/src/ip/ipv4/packet.rs b/packet/src/ip/ipv4/packet.rs
@@ -38,15 +38,15 @@ impl<B: AsRef<[u8]>> IpV4Packet<B> {
         Self { buffer }
     }
     pub fn new(buffer: B) -> io::Result<Self> {
-        if buffer.as_ref()[0] >> 4 != 4 {
-            Err(io::Error::from(io::ErrorKind::InvalidData))?;
-        }
         if buffer.as_ref().len() < 20 {
-            Err(io::Error::from(io::ErrorKind::InvalidData))?;
+            Err(io::Error::new(io::ErrorKind::InvalidData, "len < 20"))?;
+        }
+        if buffer.as_ref()[0] >> 4 != 4 {
+            Err(io::Error::new(io::ErrorKind::InvalidData, "not ipv4"))?;
         }
         let packet = Self::unchecked(buffer);
         if packet.buffer.as_ref().len() < packet.header_len() as usize * 4 {
-            Err(io::Error::from(io::ErrorKind::InvalidData))?;
+            Err(io::Error::new(io::ErrorKind::InvalidData, "head_len err"))?;
         }
         Ok(packet)
     }

diff --git a/packet/src/lib.rs b/packet/src/lib.rs
@@ -103,9 +103,9 @@ pub fn ipv4_cal_checksum(
     src_ip: &Ipv4Addr,
     dest_ip: &Ipv4Addr,
     protocol: u8,
-    length: u16,
 ) -> u16 {
     use std::io::Cursor;
+    let length = buffer.len();
     let mut sum = 0;
     let src_ip = src_ip.octets();
     sum += u32c(src_ip[0], src_ip[1]);

diff --git a/packet/src/tcp/tcp.rs b/packet/src/tcp/tcp.rs
@@ -134,7 +134,6 @@ impl<B: AsRef<[u8]>> TcpPacket<B> {
             &self.source_ip,
             &self.destination_ip,
             6,
-            self.buffer.as_ref().len() as u16,
         )
     }
     pub fn urgent_pointer(&self) -> u16 {

diff --git a/packet/src/udp/udp.rs b/packet/src/udp/udp.rs
@@ -102,16 +102,15 @@ impl<B: AsRef<[u8]>> UdpPacket<B> {
             &self.source_ip,
             &self.destination_ip,
             17,
-            self.length(),
         )
     }
 }
 
-impl<B: AsRef<[u8]> + AsMut<[u8]>> UdpPacket<B> {
-    fn header_mut(&mut self) -> &mut [u8] {
-        &mut self.buffer.as_mut()[..8]
-    }
-}
+// impl<B: AsRef<[u8]> + AsMut<[u8]>> UdpPacket<B> {
+//     fn header_mut(&mut self) -> &mut [u8] {
+//         &mut self.buffer.as_mut()[..8]
+//     }
+// }
 
 impl<B: AsRef<[u8]> + AsMut<[u8]>> UdpPacket<B> {
     /// 设置源端口