On Linux, best-effort upgrade the socket's SO_TIMESTAMPING flags to TX_SOFTWARE | OPT_ID | OPT_TSONLY after a successful Open and before the first Echo probe. Promote the #103 error-queue foundation to production: MSG_ERRQUEUE is drained opportunistically with a fixed per-call budget at several natural choke points (after a probe send, before processing a reply, before evaluating timeouts), and each automatic OPT_ID timestamp is correlated directly with wire_seq — safe because Linux rolls back its speculative sk_tskey increment on every send failure, wire_seq and the kernel counter start together at every Open, and a socket can never be reopened for a second session. The observed kernel TX wall timestamp is retained on PendingProbe (surviving pending -> timed-out retention) as dormant metadata only; RTT, OWD, and IPDV are unchanged and continue to use the userspace send timestamp exclusively. Capability failure is fully non-fatal and RX timestamping is unaffected either way. Non-Linux and non-ancillary builds are unchanged.
191 lines
5.9 KiB
Rust
191 lines
5.9 KiB
Rust
use std::{
|
|
io,
|
|
net::{SocketAddr, UdpSocket},
|
|
time::SystemTime,
|
|
};
|
|
|
|
use crate::{metadata::ReceiveMeta, timing::ClientTimestamp};
|
|
|
|
#[cfg(all(target_os = "linux", feature = "ancillary"))]
|
|
mod linux;
|
|
|
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
|
pub(crate) struct ReceivedDatagram {
|
|
pub(crate) len: usize,
|
|
pub(crate) received_at: ClientTimestamp,
|
|
pub(crate) meta: ReceiveMeta,
|
|
}
|
|
|
|
#[cfg(not(all(target_os = "linux", feature = "ancillary")))]
|
|
pub(crate) fn recv_datagram(
|
|
socket: &UdpSocket,
|
|
buf: &mut [u8],
|
|
) -> Result<ReceivedDatagram, io::Error> {
|
|
let len = socket.recv(buf)?;
|
|
let received_at = ClientTimestamp::now();
|
|
|
|
Ok(ReceivedDatagram {
|
|
len,
|
|
received_at,
|
|
meta: ReceiveMeta::default(),
|
|
})
|
|
}
|
|
|
|
#[cfg(all(target_os = "linux", feature = "ancillary"))]
|
|
pub(crate) fn recv_datagram(
|
|
socket: &UdpSocket,
|
|
buf: &mut [u8],
|
|
) -> Result<ReceivedDatagram, io::Error> {
|
|
linux::recv_datagram(socket, buf)
|
|
}
|
|
|
|
#[cfg(all(
|
|
feature = "tokio",
|
|
not(all(target_os = "linux", feature = "ancillary"))
|
|
))]
|
|
pub(crate) fn try_recv_tokio_datagram(
|
|
socket: &tokio::net::UdpSocket,
|
|
buf: &mut [u8],
|
|
) -> Result<ReceivedDatagram, io::Error> {
|
|
let len = socket.try_recv(buf)?;
|
|
let received_at = ClientTimestamp::now();
|
|
|
|
Ok(ReceivedDatagram {
|
|
len,
|
|
received_at,
|
|
meta: ReceiveMeta::default(),
|
|
})
|
|
}
|
|
|
|
#[cfg(all(feature = "tokio", target_os = "linux", feature = "ancillary"))]
|
|
pub(crate) fn try_recv_tokio_datagram(
|
|
socket: &tokio::net::UdpSocket,
|
|
buf: &mut [u8],
|
|
) -> Result<ReceivedDatagram, io::Error> {
|
|
linux::try_recv_tokio_datagram(socket, buf)
|
|
}
|
|
|
|
#[cfg(not(all(target_os = "linux", feature = "ancillary")))]
|
|
pub(crate) fn configure_receive_metadata(
|
|
_socket: &UdpSocket,
|
|
_remote: SocketAddr,
|
|
) -> io::Result<()> {
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(all(target_os = "linux", feature = "ancillary"))]
|
|
pub(crate) fn configure_receive_metadata(socket: &UdpSocket, remote: SocketAddr) -> io::Result<()> {
|
|
linux::configure_receive_metadata(socket, remote)
|
|
}
|
|
|
|
/// Best-effort upgrade a socket from RX-only to RX+TX kernel software
|
|
/// timestamping. Returns whether the upgrade succeeded; a caller should
|
|
/// track this to skip later drains entirely rather than perform harmless
|
|
/// no-op ones. Always returns `false` off Linux or without the `ancillary`
|
|
/// feature, so callers never need their own platform `cfg`.
|
|
#[cfg(not(all(target_os = "linux", feature = "ancillary")))]
|
|
pub(crate) fn try_enable_tx_timestamping<S>(_socket: &S) -> bool {
|
|
false
|
|
}
|
|
|
|
#[cfg(all(target_os = "linux", feature = "ancillary"))]
|
|
pub(crate) fn try_enable_tx_timestamping<S: std::os::fd::AsFd>(socket: &S) -> bool {
|
|
linux::try_enable_tx_timestamping(socket)
|
|
}
|
|
|
|
/// Bounded, nonblocking drain of `socket`'s `MSG_ERRQUEUE`, reporting each
|
|
/// usable TX timestamp completion to `on_timestamp`. Always a no-op off
|
|
/// Linux or without the `ancillary` feature.
|
|
#[cfg(not(all(target_os = "linux", feature = "ancillary")))]
|
|
pub(crate) fn drain_tx_timestamps<S>(
|
|
_socket: &S,
|
|
_on_timestamp: impl FnMut(u32, SystemTime),
|
|
) -> io::Result<()> {
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(all(target_os = "linux", feature = "ancillary"))]
|
|
pub(crate) fn drain_tx_timestamps<S: std::os::fd::AsRawFd>(
|
|
socket: &S,
|
|
on_timestamp: impl FnMut(u32, SystemTime),
|
|
) -> io::Result<()> {
|
|
linux::drain_tx_timestamps(socket, on_timestamp)
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use std::net::UdpSocket;
|
|
|
|
use crate::{metadata::ReceiveMeta, receive::recv_datagram, timing::ClientTimestamp};
|
|
|
|
fn connected_loopback_pair() -> (UdpSocket, UdpSocket) {
|
|
let a = UdpSocket::bind("127.0.0.1:0").unwrap();
|
|
let b = UdpSocket::bind("127.0.0.1:0").unwrap();
|
|
a.connect(b.local_addr().unwrap()).unwrap();
|
|
b.connect(a.local_addr().unwrap()).unwrap();
|
|
(a, b)
|
|
}
|
|
|
|
#[test]
|
|
fn fallback_receive_returns_length() {
|
|
let (sender, receiver) = connected_loopback_pair();
|
|
sender.send(b"hello").unwrap();
|
|
|
|
let mut buf = [0_u8; 16];
|
|
let datagram = recv_datagram(&receiver, &mut buf).unwrap();
|
|
|
|
assert_eq!(datagram.len, 5);
|
|
assert_eq!(&buf[..datagram.len], b"hello");
|
|
}
|
|
|
|
#[test]
|
|
fn fallback_receive_returns_default_metadata() {
|
|
let (sender, receiver) = connected_loopback_pair();
|
|
sender.send(b"meta").unwrap();
|
|
|
|
let mut buf = [0_u8; 16];
|
|
let datagram = recv_datagram(&receiver, &mut buf).unwrap();
|
|
|
|
assert_eq!(datagram.meta, ReceiveMeta::default());
|
|
}
|
|
|
|
#[test]
|
|
fn fallback_receive_captures_timestamp_after_successful_receive() {
|
|
let (sender, receiver) = connected_loopback_pair();
|
|
sender.send(b"time").unwrap();
|
|
|
|
let before = ClientTimestamp::now();
|
|
let mut buf = [0_u8; 16];
|
|
let datagram = recv_datagram(&receiver, &mut buf).unwrap();
|
|
let after = ClientTimestamp::now();
|
|
|
|
assert!(datagram.received_at.mono >= before.mono);
|
|
assert!(datagram.received_at.mono <= after.mono);
|
|
}
|
|
|
|
#[cfg(feature = "tokio")]
|
|
#[test]
|
|
fn tokio_try_receive_preserves_fallback_metadata_and_would_block() {
|
|
let runtime = tokio::runtime::Builder::new_current_thread()
|
|
.enable_io()
|
|
.build()
|
|
.unwrap();
|
|
|
|
runtime.block_on(async {
|
|
let (sender, receiver) = connected_loopback_pair();
|
|
receiver.set_nonblocking(true).unwrap();
|
|
let receiver = tokio::net::UdpSocket::from_std(receiver).unwrap();
|
|
sender.send(b"tokio").unwrap();
|
|
receiver.readable().await.unwrap();
|
|
|
|
let mut buf = [0_u8; 16];
|
|
let datagram = super::try_recv_tokio_datagram(&receiver, &mut buf).unwrap();
|
|
assert_eq!(&buf[..datagram.len], b"tokio");
|
|
assert_eq!(datagram.meta, ReceiveMeta::default());
|
|
|
|
let error = super::try_recv_tokio_datagram(&receiver, &mut buf).unwrap_err();
|
|
assert_eq!(error.kind(), std::io::ErrorKind::WouldBlock);
|
|
});
|
|
}
|
|
}
|