feat(common): make Datagram generic over payload type

Previously the payload type of `Datagram` was `Vec<u8>`, thus the `Datagram`
always owned the UDP datagram payload.

This change enables `Datagram` to represent both (a) an owned payload allocation
(i.e. `Vec<u8>`), but also represent (b) a view into an existing payload (e.g. a
long lived receive buffer via `&[u8]`).

The default payload type stays `Vec<u8>`, thus not breaking existing usage of
`Datagram`.

neqo-common/src/datagram.rs

@@ -9,23 +9,14 @@ use std::{net::SocketAddr, ops::Deref};
 use crate::{hex_with_len, IpTos};
 
 #[derive(Clone, PartialEq, Eq)]
-pub struct Datagram {
+pub struct Datagram<D = Vec<u8>> {
     src: SocketAddr,
     dst: SocketAddr,
     tos: IpTos,
-    d: Vec<u8>,
+    d: D,
 }
 
-impl Datagram {
-    pub fn new<V: Into<Vec<u8>>>(src: SocketAddr, dst: SocketAddr, tos: IpTos, d: V) -> Self {
-        Self {
-            src,
-            dst,
-            tos,
-            d: d.into(),
-        }
-    }
-
+impl<D> Datagram<D> {
     #[must_use]
     pub const fn source(&self) -> SocketAddr {
         self.src
@@ -46,15 +37,43 @@ impl Datagram {
     }
 }
 
-impl Deref for Datagram {
-    type Target = Vec<u8>;
+impl<D: AsRef<[u8]>> Datagram<D> {
+    pub fn len(&self) -> usize {
+        self.d.as_ref().len()
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
+}
+
+// TODO: Needed?
+impl<D: AsMut<[u8]> + AsRef<[u8]>> AsMut<[u8]> for Datagram<D> {
+    fn as_mut(&mut self) -> &mut [u8] {
+        self.d.as_mut()
+    }
+}
+
+impl Datagram<Vec<u8>> {
+    pub fn new<V: Into<Vec<u8>>>(src: SocketAddr, dst: SocketAddr, tos: IpTos, d: V) -> Self {
+        Self {
+            src,
+            dst,
+            tos,
+            d: d.into(),
+        }
+    }
+}
+
+impl<D: AsRef<[u8]>> Deref for Datagram<D> {
+    type Target = [u8];
     #[must_use]
     fn deref(&self) -> &Self::Target {
-        &self.d
+        AsRef::<[u8]>::as_ref(self)
     }
 }
 
-impl std::fmt::Debug for Datagram {
+impl<D: AsRef<[u8]>> std::fmt::Debug for Datagram<D> {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         write!(
             f,
@@ -67,6 +86,29 @@ impl std::fmt::Debug for Datagram {
     }
 }
 
+impl<'a> Datagram<&'a [u8]> {
+    #[must_use]
+    pub const fn from_slice(src: SocketAddr, dst: SocketAddr, tos: IpTos, d: &'a [u8]) -> Self {
+        Self { src, dst, tos, d }
+    }
+
+    #[must_use]
+    pub fn to_owned(&self) -> Datagram {
+        Datagram {
+            src: self.src,
+            dst: self.dst,
+            tos: self.tos,
+            d: self.d.to_vec(),
+        }
+    }
+}
+
+impl<D: AsRef<[u8]>> AsRef<[u8]> for Datagram<D> {
+    fn as_ref(&self) -> &[u8] {
+        self.d.as_ref()
+    }
+}
+
 #[cfg(test)]
 use test_fixture::datagram;
 

test-fixture/src/lib.rs

@@ -358,8 +358,8 @@ fn split_packet(buf: &[u8]) -> (&[u8], Option<&[u8]>) {
 pub fn split_datagram(d: &Datagram) -> (Datagram, Option<Datagram>) {
     let (a, b) = split_packet(&d[..]);
     (
-        Datagram::new(d.source(), d.destination(), d.tos(), a),
-        b.map(|b| Datagram::new(d.source(), d.destination(), d.tos(), b)),
+        Datagram::new(d.source(), d.destination(), d.tos(), a.to_vec()),
+        b.map(|b| Datagram::new(d.source(), d.destination(), d.tos(), b.to_vec())),
     )
 }