Implement into_buffer() alongside buffer() and into_bytes() alongside…

… as_bytes()

src/arp.rs

@@ -52,8 +52,19 @@ impl<'a> ArpPdu<'a> {
         self.buffer
     }
 
+    /// Consumes this object and returns a reference to the entire underlying buffer that was provided during
+    /// construction
+    pub fn into_buffer(self) -> &'a [u8] {
+        self.buffer
+    }
+
     /// Returns the slice of the underlying buffer that contains this PDU
     pub fn as_bytes(&'a self) -> &'a [u8] {
+        self.clone().into_bytes()
+    }
+
+    /// Consumes this object and returns the slice of the underlying buffer that contains this PDU
+    pub fn into_bytes(self) -> &'a [u8] {
         &self.buffer[0..28]
     }
 

src/ethernet.rs

@@ -67,8 +67,19 @@ impl<'a> EthernetPdu<'a> {
         self.buffer
     }
 
+    /// Consumes this object and returns a reference to the entire underlying buffer that was provided during
+    /// construction
+    pub fn into_buffer(self) -> &'a [u8] {
+        self.buffer
+    }
+
     /// Returns the slice of the underlying buffer that contains the header part of this PDU
     pub fn as_bytes(&'a self) -> &'a [u8] {
+        self.clone().into_bytes()
+    }
+
+    /// Consumes this object and returns the slice of the underlying buffer that contains the header part of this PDU
+    pub fn into_bytes(self) -> &'a [u8] {
         &self.buffer[0..self.computed_ihl()]
     }
 

src/gre.rs

@@ -57,8 +57,19 @@ impl<'a> GrePdu<'a> {
         self.buffer
     }
 
+    /// Consumes this object and returns a reference to the entire underlying buffer that was provided during
+    /// construction
+    pub fn into_buffer(self) -> &'a [u8] {
+        self.buffer
+    }
+
     /// Returns the slice of the underlying buffer that contains the header part of this PDU
     pub fn as_bytes(&'a self) -> &'a [u8] {
+        self.clone().into_bytes()
+    }
+
+    /// Consumes this object and returns the slice of the underlying buffer that contains the header part of this PDU
+    pub fn into_bytes(self) -> &'a [u8] {
         &self.buffer[0..self.computed_ihl()]
     }
 

src/icmp.rs

@@ -46,8 +46,19 @@ impl<'a> IcmpPdu<'a> {
         self.buffer
     }
 
+    /// Consumes this object and returns a reference to the entire underlying buffer that was provided during
+    /// construction
+    pub fn into_buffer(self) -> &'a [u8] {
+        self.buffer
+    }
+
     /// Returns the slice of the underlying buffer that contains the header part of this PDU
     pub fn as_bytes(&'a self) -> &'a [u8] {
+        self.clone().into_bytes()
+    }
+
+    /// Consumes this object and returns the slice of the underlying buffer that contains the header part of this PDU
+    pub fn into_bytes(self) -> &'a [u8] {
         &self.buffer[0..8]
     }
 

src/ip.rs

@@ -74,9 +74,7 @@ impl<'a> Ipv4Pdu<'a> {
         if buffer.len() < 20 || pdu.computed_ihl() < 20 {
             return Err(Error::Truncated);
         }
-        if buffer.len() < (pdu.computed_ihl() as usize)
-            || (pdu.total_length() as usize) < pdu.computed_ihl()
-        {
+        if buffer.len() < (pdu.computed_ihl() as usize) || (pdu.total_length() as usize) < pdu.computed_ihl() {
             return Err(Error::Malformed);
         }
         if pdu.version() != 4 {
@@ -116,8 +114,19 @@ impl<'a> Ipv4Pdu<'a> {
         self.buffer
     }
 
+    /// Consumes this object and returns a reference to the entire underlying buffer that was provided during
+    /// construction
+    pub fn into_buffer(self) -> &'a [u8] {
+        self.buffer
+    }
+
     /// Returns the slice of the underlying buffer that contains the header part of this PDU
     pub fn as_bytes(&'a self) -> &'a [u8] {
+        self.clone().into_bytes()
+    }
+
+    /// Consumes this object and returns the slice of the underlying buffer that contains the header part of this PDU
+    pub fn into_bytes(self) -> &'a [u8] {
         &self.buffer[0..self.computed_ihl()]
     }
 
@@ -309,6 +318,11 @@ impl<'a> Ipv6Pdu<'a> {
 
     /// Returns the slice of the underlying buffer that contains the header part of this PDU
     pub fn as_bytes(&'a self) -> &'a [u8] {
+        self.clone().into_bytes()
+    }
+
+    /// Consumes this object and returns the slice of the underlying buffer that contains the header part of this PDU
+    pub fn into_bytes(self) -> &'a [u8] {
         &self.buffer[0..self.computed_ihl()]
     }
 

src/tcp.rs

@@ -86,8 +86,19 @@ impl<'a> TcpPdu<'a> {
         self.buffer
     }
 
+    /// Consumes this object and returns a reference to the entire underlying buffer that was provided during
+    /// construction
+    pub fn into_buffer(self) -> &'a [u8] {
+        self.buffer
+    }
+
     /// Returns the slice of the underlying buffer that contains the header part of this PDU
     pub fn as_bytes(&'a self) -> &'a [u8] {
+        self.clone().into_bytes()
+    }
+
+    /// Consumes this object and returns the slice of the underlying buffer that contains the header part of this PDU
+    pub fn into_bytes(self) -> &'a [u8] {
         &self.buffer[0..self.computed_data_offset()]
     }
 

src/udp.rs

@@ -47,8 +47,19 @@ impl<'a> UdpPdu<'a> {
         self.buffer
     }
 
+    /// Consumes this object and returns a reference to the entire underlying buffer that was provided during
+    /// construction
+    pub fn into_buffer(self) -> &'a [u8] {
+        self.buffer
+    }
+
     /// Returns the slice of the underlying buffer that contains the header part of this PDU
     pub fn as_bytes(&'a self) -> &'a [u8] {
+        self.clone().into_bytes()
+    }
+
+    /// Consumes this object and returns the slice of the underlying buffer that contains the header part of this PDU
+    pub fn into_bytes(self) -> &'a [u8] {
         &self.buffer[0..8]
     }