gsadmin/noq
1
0
Fork 0
mirror of https://github.com/n0-computer/noq.git synced 2026-09-21 02:33:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(udp): Disable SO_TIMESTAMPNS for now (#776)

Browse Source 
## Description

We do not rely on this, and the implementation is broken on musl.

Fixes #774.


## Breaking Changes

n/a

## Notes & open questions

We need to run tests on musl in CI somehow.

## Change checklist

- [x] Self-review.
- [x] Tests if relevant.
- [x] This PR was created by a human that thought critically about the
      proposed change and wrote an as clear and concise description as
      they could.
- [x] This PR isn't slop, and is carefully crafted to do have the
      intented effect.
- [x] `cargo make` passes locally.

---------

Co-authored-by: dignifiedquire <me@dignifiedquire.com>
This commit is contained in:
Floris Bruynooghe
2026-07-29 17:26:30 +02:00
committed by GitHub
parent f07006e735
commit 20d6fec70d
3 changed files with 66 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/ci.yml
+42
View File
@@ -64,6 +64,48 @@ jobs:
- name: Build and test noq-udp (posix_minimal)
run: cargo test --locked -p noq-udp
test_musl:
name: Test ${{ matrix.target }}
if: "github.event_name != 'pull_request' || ! contains(github.event.pull_request.labels.*.name, 'flaky-test')"
timeout-minutes: 30
strategy:
fail-fast: false
matrix:
include:
# musl binaries are statically linked, and each target runs on a runner
# of its own architecture, so the tests run natively.
- target: aarch64-unknown-linux-musl
runner: ubuntu-24.04-arm
- target: x86_64-unknown-linux-musl
runner: ubuntu-latest
runs-on: ${{ matrix.runner }}
env:
RUSTC_WRAPPER: "sccache"
SCCACHE_GHA_ENABLED: "on"
# When cross-compiling to musl, cc-rs looks for `<arch>-linux-musl-gcc`,
# but `musl-tools` only ships the host-native `musl-gcc`.
CC_aarch64_unknown_linux_musl: musl-gcc
CC_x86_64_unknown_linux_musl: musl-gcc
steps:
- uses: actions/checkout@v6
- uses: dtolnay/rust-toolchain@stable
with:
target: ${{ matrix.target }}
- uses: mozilla-actions/sccache-action@v0.0.9
- name: Install musl toolchain
run: |
sudo apt-get update
sudo apt-get install -y musl-tools
- name: Install cargo-nextest
uses: taiki-e/install-action@v2
with:
tool: nextest@0.9.80
- name: Run tests
run: |
cargo nextest run --locked --workspace --exclude fuzz --lib --bins --tests --target ${{ matrix.target }} --profile ci
env:
RUST_LOG: ${{ runner.debug && 'TRACE' || 'DEBUG'}}
esp32_check:
name: ESP32-C3 build check (noq-udp, noq-proto, noq)
if: "github.event_name != 'pull_request' || ! contains(github.event.pull_request.labels.*.name, 'flaky-test')"
noq-udp/src/unix.rs
+6 -5
View File
@@ -136,11 +136,12 @@ impl UdpSocketState {
gro_segments = NonZeroUsize::new(64).expect("known");
}
if let Err(_err) =
set_socket_option(&*io, libc::SOL_SOCKET, libc::SO_TIMESTAMPNS, OPTION_ON)
{
crate::log::debug!("Ignoring error setting SO_TIMESTAMPNS on socket: {_err:?}");
}
// Disable SO_TIMESTAMPNS for now: https://github.com/n0-computer/noq/issues/774
// if let Err(_err) =
// set_socket_option(&*io, libc::SOL_SOCKET, libc::SO_TIMESTAMPNS, OPTION_ON)
// {
// crate::log::debug!("Ignoring error setting SO_TIMESTAMPNS on socket: {_err:?}");
// }
}
#[cfg(any(target_os = "freebsd", apple))]
{
noq-udp/tests/tests.rs
+18 -16
View File
@@ -473,25 +473,27 @@ fn test_send_recv(send: &Socket, recv: &Socket, transmit: Transmit<'_>) {
assert_eq!(meta.ecn, transmit.ecn);
}
// Disable SO_TIMESTAMPNS for now: https://github.com/n0-computer/noq/issues/774
assert!(meta.timestamp.is_none());
// On Linux and Android, we expect the kernel to provide a receive timestamp
// since we explicitly enabled `SO_TIMESTAMPNS`.
#[cfg(all(any(target_os = "linux", target_os = "android"), not(posix_minimal)))]
{
assert!(
meta.timestamp.is_some(),
"Kernel timestamp should be present on Linux/Android"
);
assert!(
meta.timestamp.unwrap() > std::time::Duration::ZERO,
"Kernel timestamp should be non-zero"
);
}
// #[cfg(all(any(target_os = "linux", target_os = "android"), not(posix_minimal)))]
// {
// assert!(
// meta.timestamp.is_some(),
// "Kernel timestamp should be present on Linux/Android"
// );
// assert!(
// meta.timestamp.unwrap() > std::time::Duration::ZERO,
// "Kernel timestamp should be non-zero"
// );
// }
// On other platforms, the timestamp should remain `None`.
#[cfg(not(any(target_os = "linux", target_os = "android", posix_minimal)))]
{
assert!(meta.timestamp.is_none());
}
// // On other platforms, the timestamp should remain `None`.
// #[cfg(not(any(target_os = "linux", target_os = "android", posix_minimal)))]
// {
// assert!(meta.timestamp.is_none());
// }
}
assert_eq!(datagrams, expected_datagrams);
}