add dlrr report

Author: Rain Liu

src/extended_report/dlrr.rs

@@ -1,5 +1,21 @@
 use super::*;
 
+const DLRR_REPORT_LENGTH: u16 = 12;
+
+/// DLRRReport encodes a single report inside a DLRRReportBlock.
+#[derive(Debug, Default, PartialEq, Clone)]
+pub struct DLRRReport {
+    pub ssrc: u32,
+    pub last_rr: u32,
+    pub dlrr: u32,
+}
+
+impl fmt::Display for DLRRReport {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{:?}", self)
+    }
+}
+
 /// DLRRReportBlock encodes a DLRR Report Block as described in
 /// RFC 3611 section 4.5.
 ///
@@ -20,7 +36,6 @@ use super::*;
 /// +=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+
 #[derive(Debug, Default, PartialEq, Clone)]
 pub struct DLRRReportBlock {
-    pub xr_header: XRHeader,
     pub reports: Vec<DLRRReport>,
 }
 
@@ -30,21 +45,21 @@ impl fmt::Display for DLRRReportBlock {
     }
 }
 
-/// DLRRReport encodes a single report inside a DLRRReportBlock.
-#[derive(Debug, Default, PartialEq, Clone)]
-pub struct DLRRReport {
-    pub ssrc: u32,
-    pub last_rr: u32,
-    pub dlrr: u32,
+impl DLRRReportBlock {
+    pub fn xr_header(&self) -> XRHeader {
+        XRHeader {
+            block_type: BlockType::DLRR,
+            type_specific: 0,
+            block_length: (self.raw_size() / 4 - 1) as u16,
+        }
+    }
 }
 
-impl fmt::Display for DLRRReport {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{:?}", self)
+impl Packet for DLRRReportBlock {
+    fn header(&self) -> Header {
+        Header::default()
     }
-}
 
-impl ReportBlock for DLRRReportBlock {
     /// destination_ssrc returns an array of ssrc values that this report block refers to.
     fn destination_ssrc(&self) -> Vec<u32> {
         let mut ssrc = Vec::with_capacity(self.reports.len());
@@ -54,28 +69,84 @@ impl ReportBlock for DLRRReportBlock {
         ssrc
     }
 
-    fn setup_block_header(&mut self) {
-        self.xr_header.block_type = ReportBlockType::DLRR;
-        self.xr_header.type_specific = 0;
-        self.xr_header.block_length = (self.raw_size() / 4 - 1) as u16;
-    }
-
-    fn unpack_block_header(&mut self) {}
-
     fn raw_size(&self) -> usize {
-        4 + self.reports.len() * 4 * 3
+        XR_HEADER_LENGTH + self.reports.len() * 4 * 3
     }
 
     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::<DLRRReportBlock>()
             .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 DLRRReportBlock {
+    fn marshal_size(&self) -> usize {
+        self.raw_size()
+    }
+}
+
+impl Marshal for DLRRReportBlock {
+    /// marshal_to encodes the DLRRReportBlock in binary
+    fn marshal_to(&self, mut buf: &mut [u8]) -> Result<usize> {
+        if buf.remaining_mut() < self.raw_size() {
+            return Err(error::Error::BufferTooShort.into());
+        }
+
+        let h = self.xr_header();
+        let n = h.marshal_to(buf)?;
+        buf = &mut buf[n..];
+
+        for rep in &self.reports {
+            buf.put_u32(rep.ssrc);
+            buf.put_u32(rep.last_rr);
+            buf.put_u32(rep.dlrr);
+        }
+
+        Ok(self.marshal_size())
+    }
+}
+
+impl Unmarshal for DLRRReportBlock {
+    /// Unmarshal decodes the DLRRReportBlock 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 % DLRR_REPORT_LENGTH != 0
+            || raw_packet.remaining() < xr_header.block_length as usize
+        {
+            return Err(error::Error::PacketTooShort.into());
+        }
+
+        let mut offset = 0;
+        let mut reports = vec![];
+        while offset < xr_header.block_length {
+            let ssrc = raw_packet.get_u32();
+            let last_rr = raw_packet.get_u32();
+            let dlrr = raw_packet.get_u32();
+            reports.push(DLRRReport {
+                ssrc,
+                last_rr,
+                dlrr,
+            });
+            offset += DLRR_REPORT_LENGTH;
+        }
+
+        Ok(DLRRReportBlock { reports })
+    }
+}

src/extended_report/mod.rs

@@ -1,8 +1,8 @@
 #[cfg(test)]
 mod extended_report_test;
 
-/*pub mod dlrr;
-pub mod prt;
+pub mod dlrr;
+/*pub mod prt;
 pub mod rle;
 pub mod rrt;
 pub mod ssr;

src/extended_report/unknown.rs

@@ -58,9 +58,9 @@ impl MarshalSize for UnknownReportBlock {
 }
 
 impl Marshal for UnknownReportBlock {
-    /// marshal_to encodes the ExtendedReport in binary
+    /// marshal_to encodes the UnknownReportBlock in binary
     fn marshal_to(&self, mut buf: &mut [u8]) -> Result<usize> {
-        if buf.remaining_mut() < XR_HEADER_LENGTH {
+        if buf.remaining_mut() < self.raw_size() {
             return Err(error::Error::BufferTooShort.into());
         }
 
@@ -75,7 +75,7 @@ impl Marshal for UnknownReportBlock {
 }
 
 impl Unmarshal for UnknownReportBlock {
-    /// Unmarshal decodes the ExtendedReport from binary
+    /// Unmarshal decodes the UnknownReportBlock from binary
     fn unmarshal<B>(raw_packet: &mut B) -> Result<Self>
     where
         Self: Sized,