Skip to content

Added FreeBSD's SCM_REALTIME and SCM_MONOTONIC into sys::socket::ControlMessageOwned #2187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SteveLauC merged 15 commits into from
Nov 25, 2023
Merged

Added FreeBSD's SCM_REALTIME and SCM_MONOTONIC into sys::socket::ControlMessageOwned #2187

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
c60b743
Added FreeBSD's SCM_REALTIME and SCM_MONOTONIC into sys::socket::Cont…
recatek Nov 13, 2023
9ebb8f3
Creating a SocketTimestamp enum for the SO_TS_CLOCK setsockopt for Fr…
recatek Nov 13, 2023
f1252a3
Fixing whitespace
recatek Nov 13, 2023
dc7baed
Fixing CI error on cfg attributes
recatek Nov 14, 2023
25ed375
Removing legacy doc attributes
recatek Nov 14, 2023
9664ea0
Formatting cleanup
recatek Nov 14, 2023
f795c4e
Updating changelog
recatek Nov 15, 2023
37c3998
Adding tests for new TsClock setsockopt enum and the two new packet t…
recatek Nov 18, 2023
d30ea30
Replacing an assert_eq with an assert in new tests.
recatek Nov 18, 2023
333d815
Removing qemu ignore for new FreeBSD tests
recatek Nov 21, 2023
668e7fb
Giving new FreeBSD timestamping tests each a unique socket
recatek Nov 21, 2023
e9098e2
Updating monotonic packet timestamp test to account for monotonicity
recatek Nov 21, 2023
9b38430
Moving test ports again to line up with changes in #2196
recatek Nov 21, 2023
71abb61
Attempting checks again
recatek Nov 23, 2023
ec8a1b6
Wrapping ptr::read_unaligned calls in unsafe blocks
recatek Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixing CI error on cfg attributes
  • Loading branch information
@recatek
recatek committed Nov 14, 2023
commit dc7baed0fd445ab08ee51b036dfd5de6f6731fb2
10 changes: 5 additions & 5 deletions src/sys/socket/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ libc_bitflags! {
}
}

#[cfg(any(target_os = "freebsd"))]
#[cfg(target_os = "freebsd")]
libc_enum! {
/// A selector for which clock to use when generating packet timestamps.
/// Used when setting [`TsClock`](crate::sys::socket::sockopt::TsClock) on a socket.
Expand Down Expand Up @@ -801,13 +801,13 @@ pub enum ControlMessageOwned {
/// Realtime clock timestamp
///
/// [Further reading](https://man.freebsd.org/cgi/man.cgi?setsockopt)
#[cfg(any(target_os = "freebsd"))]
#[cfg(target_os = "freebsd")]
#[cfg_attr(docsrs, doc(cfg(all())))]
ScmRealtime(TimeSpec),
/// Monotonic clock timestamp
///
/// [Further reading](https://man.freebsd.org/cgi/man.cgi?setsockopt)
#[cfg(any(target_os = "freebsd"))]
#[cfg(target_os = "freebsd")]
#[cfg_attr(docsrs, doc(cfg(all())))]
ScmMonotonic(TimeSpec),
#[cfg(any(
Expand Down Expand Up @@ -989,12 +989,12 @@ impl ControlMessageOwned {
let ts: libc::timespec = ptr::read_unaligned(p as *const _);
ControlMessageOwned::ScmTimestampns(TimeSpec::from(ts))
}
#[cfg(any(target_os = "freebsd"))]
#[cfg(target_os = "freebsd")]
(libc::SOL_SOCKET, libc::SCM_REALTIME) => {
let ts: libc::timespec = ptr::read_unaligned(p as *const _);
ControlMessageOwned::ScmRealtime(TimeSpec::from(ts))
}
#[cfg(any(target_os = "freebsd"))]
#[cfg(target_os = "freebsd")]
(libc::SOL_SOCKET, libc::SCM_MONOTONIC) => {
let ts: libc::timespec = ptr::read_unaligned(p as *const _);
ControlMessageOwned::ScmMonotonic(TimeSpec::from(ts))
Expand Down