Skip to content

Commit c3e6e6a

Browse files
bors[bot]spencercw
andauthored
Merge #2048
2048: Enable additional socket timestamping flags r=asomers a=spencercw Co-authored-by: Chris Spencer <[email protected]>
2 parents b12aeb7 + d66c0c1 commit c3e6e6a

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
1818
- Added `LocalPeerPid` to `nix::sys::socket::sockopt` for macOS. ([#1967](https://github.com/nix-rust/nix/pull/1967))
1919
- Added `TFD_TIMER_CANCEL_ON_SET` to `::nix::sys::time::TimerSetTimeFlags` on Linux and Android.
2020
([#2040](https://github.com/nix-rust/nix/pull/2040))
21+
- Added `SOF_TIMESTAMPING_OPT_ID` and `SOF_TIMESTAMPING_OPT_TSONLY` to `nix::sys::socket::TimestampingFlag`.
22+
([#2048](https://github.com/nix-rust/nix/pull/2048))
2123

2224
### Changed
2325

src/sys/socket/mod.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,14 +247,18 @@ libc_bitflags! {
247247
SOF_TIMESTAMPING_SOFTWARE;
248248
/// Report hardware timestamps as generated by SOF_TIMESTAMPING_TX_HARDWARE when available.
249249
SOF_TIMESTAMPING_RAW_HARDWARE;
250-
/// Collect transmiting timestamps as reported by hardware
250+
/// Collect transmitting timestamps as reported by hardware
251251
SOF_TIMESTAMPING_TX_HARDWARE;
252-
/// Collect transmiting timestamps as reported by software
252+
/// Collect transmitting timestamps as reported by software
253253
SOF_TIMESTAMPING_TX_SOFTWARE;
254254
/// Collect receiving timestamps as reported by hardware
255255
SOF_TIMESTAMPING_RX_HARDWARE;
256256
/// Collect receiving timestamps as reported by software
257257
SOF_TIMESTAMPING_RX_SOFTWARE;
258+
/// Generate a unique identifier along with each transmitted packet
259+
SOF_TIMESTAMPING_OPT_ID;
260+
/// Return transmit timestamps alongside an empty packet instead of the original packet
261+
SOF_TIMESTAMPING_OPT_TSONLY;
258262
}
259263
}
260264

0 commit comments

Comments
 (0)