feat: add take_buffer method for packets

Author: hlzhang

README.md

@@ -27,7 +27,7 @@ cargo fmt --all -- --check
 
 Generate test coverage report (cargo-tarpaulin)
 ```shell script
-docker run --rm -it --security-opt seccomp=unconfined -v "${PWD}:/volume" xd009642/tarpaulin sh -c "cargo tarpaulin --out Html"
+docker run --rm -it --security-opt seccomp=unconfined -v "${PWD}:/volume" xd009642/tarpaulin sh -c "cargo tarpaulin --ignore-tests --out Html"
 #docker run --rm -it --security-opt seccomp=unconfined -v "${PWD}:/volume" xd009642/tarpaulin sh -c "cargo tarpaulin --run-types Doctests --all"
 #docker run --rm -it --security-opt seccomp=unconfined -v "${PWD}:/volume" xd009642/tarpaulin sh -c "cargo tarpaulin --run-types Tests --all"
 #docker run --rm -it --security-opt seccomp=unconfined -v "${PWD}:/volume" xd009642/tarpaulin sh -c "cargo tarpaulin --run-types Doctests Tests --all"

src/protocol/addr.rs

@@ -130,6 +130,10 @@ impl<T: AsRef<[u8]>> HasAddr<T> {
         }
         Ok(())
     }
+
+    pub fn take_buffer(self) -> T {
+        self.buffer
+    }
 }
 
 impl<'a, T: AsRef<[u8]> + ?Sized> HasAddr<&'a T> {

src/protocol/cmd_rep.rs

@@ -198,6 +198,10 @@ impl<T: AsRef<[u8]>> Packet<T> {
     pub fn port(&self) -> u16 {
         self.0.port()
     }
+
+    pub fn take_buffer(self) -> T {
+        self.0.take_buffer()
+    }
 }
 
 impl<'a, T: AsRef<[u8]> + ?Sized> Packet<&'a T> {

src/protocol/method_selection.rs

@@ -72,6 +72,10 @@ impl<T: AsRef<[u8]>> RequestPacket<T> {
         let methods = &data[field::methods(self.nmethods())];
         Method::try_from_slice(methods)
     }
+
+    pub fn take_buffer(self) -> T {
+        self.buffer
+    }
 }
 
 impl<'a, T: AsRef<[u8]> + ?Sized> RequestPacket<&'a T> {
@@ -263,6 +267,10 @@ impl<T: AsRef<[u8]>> ReplyPacket<T> {
         let data = self.buffer.as_ref();
         data[field::METHOD]
     }
+
+    pub fn take_buffer(self) -> T {
+        self.buffer
+    }
 }
 
 impl<T: AsRef<[u8]> + AsMut<[u8]>> ReplyPacket<T> {

src/protocol/rfc1929.rs

@@ -168,6 +168,10 @@ impl<T: AsRef<[u8]>> RequestPacket<T> {
         let data = self.buffer.as_ref();
         data[self.pos_plen()]
     }
+
+    pub fn take_buffer(self) -> T {
+        self.buffer
+    }
 }
 
 impl<'a, T: AsRef<[u8]> + ?Sized> RequestPacket<&'a T> {
@@ -389,6 +393,10 @@ impl<T: AsRef<[u8]>> ReplyPacket<T> {
         let data = self.buffer.as_ref();
         data[field::STATUS]
     }
+
+    pub fn take_buffer(self) -> T {
+        self.buffer
+    }
 }
 
 impl<T: AsRef<[u8]> + AsMut<[u8]>> ReplyPacket<T> {
@@ -688,13 +696,12 @@ mod tests {
         let mut bytes_mut = BytesMut::new();
         ReplyRepr::encode(&repr, &mut bytes_mut).expect("should encode");
         let pkt = ReplyPacket::new_checked(bytes_mut.as_ref()).expect("new packet should success");
-        assert_eq!(pkt.version(), repr.ver as u8);
+        assert_eq!(pkt.version(), Ver::X01 as u8);
         assert_eq!(pkt.status(), repr.status as u8);
 
         let decoded = ReplyRepr::decode(&mut bytes_mut)
             .expect("decode should success")
             .expect("should present");
-        assert_eq!(decoded.ver, Ver::X01);
         assert_eq!(decoded.status, Status::Failure);
     }
 
@@ -708,15 +715,14 @@ mod tests {
         ReplyRepr::encode(&repr, &mut bytes_mut).expect("should encode");
         let pkt = ReplyPacket::new_checked(bytes_mut.as_ref()).expect("new packet should success");
         assert_eq!(pkt.total_len(), 2);
-        assert_eq!(pkt.version(), repr.ver as u8);
+        assert_eq!(pkt.version(), Ver::X01 as u8);
         assert_eq!(pkt.status(), repr.status as u8);
-        assert_eq!(pkt.as_ref()[0], repr.ver as u8);
+        assert_eq!(pkt.as_ref()[0], Ver::X01 as u8);
         assert_eq!(pkt.as_ref()[1], repr.status as u8);
 
         let decoded = ReplyRepr::decode(&mut bytes_mut)
             .expect("decode should success")
             .expect("should present");
-        assert_eq!(decoded.ver, Ver::X01);
         assert_eq!(decoded.status, Status::Success);
     }