diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-09-12 03:49:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-12 03:49:16 +0000 |
| commit | bf4f2738c9b4ad2ec1a2277358f94240f69fb8c8 (patch) | |
| tree | f3846e57e885066b3820b5a83345de66d31dbf49 /src/sys/mod.rs | |
| parent | f44a50685773f44e88e31b83a3d49d278132a21c (diff) | |
| parent | 2a31ac127abff33eb26844fc06138bf0e3291bb1 (diff) | |
| parent | 1ce595f526023bc007a9e0331b46ce95caeffc1f (diff) | |
| download | nix-bf4f2738c9b4ad2ec1a2277358f94240f69fb8c8.zip | |
Merge #1509 #1515
1509: Allow Android to use timerfd r=asomers a=rtzoeller
This is a continuation of #1336 which also enables the timerfd tests.
```
running 3 tests
test sys::test_timerfd::test_timerfd_unset ... ok
test sys::test_timerfd::test_timerfd_oneshot ... ok
test sys::test_timerfd::test_timerfd_interval ... ok
```
1515: Add IP_TTL/IPV6_UNICAST_HOPS SockOpts r=asomers a=cemeyer
Test: `cargo test --test test test_ttl_opts`
Co-authored-by: Ryan Zoeller <rtzoeller@rtzoeller.com>
Co-authored-by: Conrad Meyer <cem@FreeBSD.org>