add rrt

Author: Rain Liu

src/extended_report/mod.rs

@@ -3,10 +3,10 @@ mod extended_report_test;
 
 pub mod dlrr;
 pub mod prt;
-pub mod rle; /*
-             pub mod rrt;
-             pub mod ssr;
-             pub mod vm;*/
+pub mod rle;
+pub mod rrt;
+/*pub mod ssr;
+pub mod vm;*/
 pub mod unknown;
 
 pub use unknown::UnknownReportBlock;

src/extended_report/rrt.rs

@@ -1,5 +1,7 @@
 use super::*;
 
+const RRT_REPORT_BLOCK_MIN_LENGTH: u16 = 8;
+
 /// ReceiverReferenceTimeReportBlock encodes a Receiver Reference Time
 /// report block as described in RFC 3611 section 4.4.
 ///
@@ -14,7 +16,6 @@ use super::*;
 /// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
 #[derive(Debug, Default, PartialEq, Clone)]
 pub struct ReceiverReferenceTimeReportBlock {
-    pub xr_header: XRHeader,
     pub ntp_timestamp: u64,
 }
 
@@ -24,34 +25,88 @@ impl fmt::Display for ReceiverReferenceTimeReportBlock {
     }
 }
 
-impl ReportBlock for ReceiverReferenceTimeReportBlock {
-    /// destination_ssrc returns an array of ssrc values that this report block refers to.
-    fn destination_ssrc(&self) -> Vec<u32> {
-        vec![]
+impl ReceiverReferenceTimeReportBlock {
+    pub fn xr_header(&self) -> XRHeader {
+        XRHeader {
+            block_type: BlockType::ReceiverReferenceTime,
+            type_specific: 0,
+            block_length: (self.raw_size() / 4 - 1) as u16,
+        }
     }
+}
 
-    fn setup_block_header(&mut self) {
-        self.xr_header.block_type = ReportBlockType::ReceiverReferenceTime;
-        self.xr_header.type_specific = 0;
-        self.xr_header.block_length = (self.raw_size() / 4 - 1) as u16;
+impl Packet for ReceiverReferenceTimeReportBlock {
+    fn header(&self) -> Header {
+        Header::default()
     }
 
-    fn unpack_block_header(&mut self) {}
+    /// destination_ssrc returns an array of ssrc values that this report block refers to.
+    fn destination_ssrc(&self) -> Vec<u32> {
+        vec![]
+    }
 
     fn raw_size(&self) -> usize {
-        4 + 8
+        XR_HEADER_LENGTH + RRT_REPORT_BLOCK_MIN_LENGTH as usize
     }
 
     fn as_any(&self) -> &(dyn Any + Send + Sync) {
         self
     }
-    fn equal(&self, other: &(dyn ReportBlock + Send + Sync)) -> bool {
+    fn equal(&self, other: &(dyn Packet + Send + Sync)) -> bool {
         other
             .as_any()
             .downcast_ref::<ReceiverReferenceTimeReportBlock>()
             .map_or(false, |a| self == a)
     }
-    fn cloned(&self) -> Box<dyn ReportBlock + Send + Sync> {
+    fn cloned(&self) -> Box<dyn Packet + Send + Sync> {
         Box::new(self.clone())
     }
 }
+
+impl MarshalSize for ReceiverReferenceTimeReportBlock {
+    fn marshal_size(&self) -> usize {
+        self.raw_size()
+    }
+}
+
+impl Marshal for ReceiverReferenceTimeReportBlock {
+    /// marshal_to encodes the PacketReceiptTimesReportBlock in binary
+    fn marshal_to(&self, mut buf: &mut [u8]) -> Result<usize> {
+        if buf.remaining_mut() < self.marshal_size() {
+            return Err(error::Error::BufferTooShort.into());
+        }
+
+        let h = self.xr_header();
+        let n = h.marshal_to(buf)?;
+        buf = &mut buf[n..];
+
+        buf.put_u64(self.ntp_timestamp);
+
+        Ok(self.marshal_size())
+    }
+}
+
+impl Unmarshal for ReceiverReferenceTimeReportBlock {
+    /// Unmarshal decodes the PacketReceiptTimesReportBlock from binary
+    fn unmarshal<B>(raw_packet: &mut B) -> Result<Self>
+    where
+        Self: Sized,
+        B: Buf,
+    {
+        if raw_packet.remaining() < XR_HEADER_LENGTH {
+            return Err(error::Error::PacketTooShort.into());
+        }
+
+        let xr_header = XRHeader::unmarshal(raw_packet)?;
+
+        if xr_header.block_length != RRT_REPORT_BLOCK_MIN_LENGTH
+            || raw_packet.remaining() < xr_header.block_length as usize
+        {
+            return Err(error::Error::PacketTooShort.into());
+        }
+
+        let ntp_timestamp = raw_packet.get_u64();
+
+        Ok(ReceiverReferenceTimeReportBlock { ntp_timestamp })
+    }
+}