Add TOS and TTL information to Datagrams

neqo-client/src/main.rs

@@ -7,6 +7,7 @@
 #![cfg_attr(feature = "deny-warnings", deny(warnings))]
 #![warn(clippy::use_self)]
 
+use common::IpTos;
 use qlog::{events::EventImportance, streamer::QlogStreamer};
 
 use mio::{net::UdpSocket, Events, Poll, PollOpt, Ready, Token};
@@ -430,7 +431,8 @@ fn process_loop(
                         break 'read;
                     }
                     if sz > 0 {
-                        let d = Datagram::new(remote, *local_addr, &buf[..sz]);
+                        let d =
+                            Datagram::new(remote, *local_addr, IpTos::default(), None, &buf[..sz]);
                         datagrams.push(d);
                     }
                 }
@@ -1142,7 +1144,7 @@ mod old {
 
     use super::{qlog_new, KeyUpdateState, Res};
     use mio::{Events, Poll};
-    use neqo_common::{event::Provider, Datagram};
+    use neqo_common::{event::Provider, Datagram, IpTos};
     use neqo_crypto::{AuthenticationStatus, ResumptionToken};
     use neqo_transport::{
         Connection, ConnectionEvent, EmptyConnectionIdGenerator, Error, Output, State, StreamId,
@@ -1367,7 +1369,13 @@ mod old {
                             break 'read;
                         }
                         if sz > 0 {
-                            let d = Datagram::new(remote, *local_addr, &buf[..sz]);
+                            let d = Datagram::new(
+                                remote,
+                                *local_addr,
+                                IpTos::default(),
+                                None,
+                                &buf[..sz],
+                            );
                             client.process_input(&d, Instant::now());
                             handler.maybe_key_update(client)?;
                         }

neqo-common/Cargo.toml

@@ -9,6 +9,7 @@ build = "build.rs"
 
 [dependencies]
 log = { version = "0.4.0", default-features = false }
+enum-map = "~2.7.3"
 env_logger = { version = "0.10", default-features = false }
 lazy_static = "1.3.0"
 qlog = "0.11.0"

neqo-common/src/datagram.rs

@@ -7,20 +7,30 @@
 use std::net::SocketAddr;
 use std::ops::Deref;
 
-use crate::hex_with_len;
+use crate::{hex_with_len, IpTos};
 
-#[derive(PartialEq, Eq, Clone)]
+#[derive(Clone, PartialEq, Eq)]
 pub struct Datagram {
     src: SocketAddr,
     dst: SocketAddr,
+    tos: IpTos,
+    ttl: Option<u8>,
     d: Vec<u8>,
 }
 
 impl Datagram {
-    pub fn new<V: Into<Vec<u8>>>(src: SocketAddr, dst: SocketAddr, d: V) -> Self {
+    pub fn new<V: Into<Vec<u8>>>(
+        src: SocketAddr,
+        dst: SocketAddr,
+        tos: IpTos,
+        ttl: Option<u8>,
+        d: V,
+    ) -> Self {
         Self {
             src,
             dst,
+            tos,
+            ttl,
             d: d.into(),
         }
     }
@@ -34,6 +44,16 @@ impl Datagram {
     pub fn destination(&self) -> SocketAddr {
         self.dst
     }
+
+    #[must_use]
+    pub fn tos(&self) -> IpTos {
+        self.tos
+    }
+
+    #[must_use]
+    pub fn ttl(&self) -> Option<u8> {
+        self.ttl
+    }
 }
 
 impl Deref for Datagram {
@@ -48,10 +68,25 @@ impl std::fmt::Debug for Datagram {
     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
         write!(
             f,
-            "Datagram {:?}->{:?}: {}",
+            "Datagram {:?} TTL {:?} {:?}->{:?}: {}",
+            self.tos,
+            self.ttl,
             self.src,
             self.dst,
             hex_with_len(&self.d)
         )
     }
 }
+
+#[cfg(test)]
+use test_fixture::datagram;
+
+#[test]
+fn fmt_datagram() {
+    let d = datagram([0; 1].to_vec());
+    assert_eq!(
+        format!("{d:?}"),
+        "Datagram IpTos(Cs0, NotEct) TTL Some(128) [fe80::1]:443->[fe80::1]:443: [1]: 00"
+            .to_string()
+    );
+}

neqo-common/src/lib.rs

@@ -16,13 +16,15 @@ mod incrdecoder;
 pub mod log;
 pub mod qlog;
 pub mod timer;
+pub mod tos;
 
 pub use self::codec::{Decoder, Encoder};
 pub use self::datagram::Datagram;
 pub use self::header::Header;
 pub use self::incrdecoder::{
     IncrementalDecoderBuffer, IncrementalDecoderIgnore, IncrementalDecoderUint,
 };
+pub use self::tos::{IpTos, IpTosDscp, IpTosEcn};
 
 use std::fmt::Write;