diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2023-07-15 20:50:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-15 20:50:11 +0000 |
| commit | c3e6e6a14244d68a9715ff75dc844d6c856049b9 (patch) | |
| tree | 9e460eab687ca00611fac5f05f503c78713d941a | |
| parent | b12aeb723c753fb441bf4e9e67ac1276677ce0e5 (diff) | |
| parent | d66c0c1d5a8c7515f699428d063f179328aff32e (diff) | |
| download | nix-c3e6e6a14244d68a9715ff75dc844d6c856049b9.zip | |
Merge #2048
2048: Enable additional socket timestamping flags r=asomers a=spencercw
Co-authored-by: Chris Spencer <spencercw@gmail.com>
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | src/sys/socket/mod.rs | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b337c8f..d865659c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,8 @@ This project adheres to [Semantic Versioning](https://semver.org/). - Added `LocalPeerPid` to `nix::sys::socket::sockopt` for macOS. ([#1967](https://github.com/nix-rust/nix/pull/1967)) - Added `TFD_TIMER_CANCEL_ON_SET` to `::nix::sys::time::TimerSetTimeFlags` on Linux and Android. ([#2040](https://github.com/nix-rust/nix/pull/2040)) +- Added `SOF_TIMESTAMPING_OPT_ID` and `SOF_TIMESTAMPING_OPT_TSONLY` to `nix::sys::socket::TimestampingFlag`. + ([#2048](https://github.com/nix-rust/nix/pull/2048)) ### Changed diff --git a/src/sys/socket/mod.rs b/src/sys/socket/mod.rs index c5a897c3..e6665aaf 100644 --- a/src/sys/socket/mod.rs +++ b/src/sys/socket/mod.rs @@ -247,14 +247,18 @@ libc_bitflags! { SOF_TIMESTAMPING_SOFTWARE; /// Report hardware timestamps as generated by SOF_TIMESTAMPING_TX_HARDWARE when available. SOF_TIMESTAMPING_RAW_HARDWARE; - /// Collect transmiting timestamps as reported by hardware + /// Collect transmitting timestamps as reported by hardware SOF_TIMESTAMPING_TX_HARDWARE; - /// Collect transmiting timestamps as reported by software + /// Collect transmitting timestamps as reported by software SOF_TIMESTAMPING_TX_SOFTWARE; /// Collect receiving timestamps as reported by hardware SOF_TIMESTAMPING_RX_HARDWARE; /// Collect receiving timestamps as reported by software SOF_TIMESTAMPING_RX_SOFTWARE; + /// Generate a unique identifier along with each transmitted packet + SOF_TIMESTAMPING_OPT_ID; + /// Return transmit timestamps alongside an empty packet instead of the original packet + SOF_TIMESTAMPING_OPT_TSONLY; } } |