feat: add support for DSCP and TTL / Hop Limit #2425

crisidev · 2024-06-03T17:44:34Z

What does this PR do

This PR improves the support for setting and retrieving of IP headers values for

Incoming packets IPv4 TTL (IP_RECVTTL)
Incoming packets IPv6 Hop Limit (IPV6_RECVHOPLIMIT)
Outgoing and incoming packets IPv4 DSCP (IP_TOS)
Outgoing and incoming packets IPv6 DSCP (IPV6_RECVTCLASS)

It includes the socket options and the appropriate control messages for sendmsg and recvmsg.

Note: I am not 100% sure I understand correctly the cfg values and feature flags of nix, so they could be set wrongly in the PR.

Checklist:

I have read CONTRIBUTING.md
I have written necessary tests and rustdoc comments
A change log has been added if this PR modifies nix's API

* Support IP_RECVTTL and IPV6_RECVHOPLIMIT socket options and related control messages for recvmsg. * Support setting DSCP in control messages for both sendmsg and recvmsg. Signed-off-by: Bigo <1781140+crisidev@users.noreply.github.com>

test/sys/test_socket.rs

src/sys/socket/sockopt.rs

src/sys/socket/mod.rs

test/sys/test_socket.rs

SteveLauC · 2024-06-10T12:33:18Z

Hi, thanks for the PR! Sorry for the late response!

Note: I am not 100% sure I understand correctly the cfg values and feature flags of nix, so they could be set wrongly in the PR.

For the cfg for targets (OSes), see

nix/build.rs

Lines 20 to 27 in 5fde28e

    
           // cfg aliases we would like to use 
        
           apple_targets: { any(ios, macos, watchos, tvos, visionos) }, 
        
           bsd: { any(freebsd, dragonfly, netbsd, openbsd, apple_targets) }, 
        
           bsd_without_apple: { any(freebsd, dragonfly, netbsd, openbsd) }, 
        
           linux_android: { any(android, linux) }, 
        
           freebsdlike: { any(dragonfly, freebsd) }, 
        
           netbsdlike: { any(netbsd, openbsd) }, 
        
           solarish: { any(illumos, solaris) },

crisidev · 2024-06-11T09:40:03Z

Hi, thanks for the PR! Sorry for the late response!

Thanks a lot for the review and don't worry about the timing :)

I'll address the comments and publish a new version!

Note: I am not 100% sure I understand correctly the cfg values and feature flags of nix, so they could be set wrongly in the PR.

For the cfg for targets (OSes), see

nix/build.rs

Lines 20 to 27 in 5fde28e

// cfg aliases we would like to use

apple_targets: { any(ios, macos, watchos, tvos, visionos) },

bsd: { any(freebsd, dragonfly, netbsd, openbsd, apple_targets) },

bsd_without_apple: { any(freebsd, dragonfly, netbsd, openbsd) },

linux_android: { any(android, linux) },

freebsdlike: { any(dragonfly, freebsd) },

netbsdlike: { any(netbsd, openbsd) },

solarish: { any(illumos, solaris) },

Co-authored-by: SteveLauC <stevelauc@outlook.com>

crisidev · 2024-06-14T13:46:57Z

The code we have right now does not build on freebsd 14 because

error[E0531]: cannot find unit struct, unit variant or constant `IP_RECVTTL` in crate `libc`
    --> src/sys/socket/mod.rs:1018:38
     |
1018 |             (libc::IPPROTO_IP, libc::IP_RECVTTL) => {
     |                                      ^^^^^^^^^^ help: a constant with a similar name exists: `IP_RECVTOS`
     |
    ::: /.cargo/registry/src/git.luolix.top-1ecc6299db9ec823/libc-0.2.155/src/unix/bsd/freebsdlike/freebsd/mod.rs:3685:1
     |
3685 | pub const IP_RECVTOS: ::c_int = 68;
     | ----------------------------- similarly named constant `IP_RECVTOS` defined here

I think we need to enable RECVTTL only on linux.

SteveLauC · 2024-06-15T08:39:09Z

The code we have right now does not build on freebsd 14 because

error[E0531]: cannot find unit struct, unit variant or constant `IP_RECVTTL` in crate `libc`
    --> src/sys/socket/mod.rs:1018:38
     |
1018 |             (libc::IPPROTO_IP, libc::IP_RECVTTL) => {
     |                                      ^^^^^^^^^^ help: a constant with a similar name exists: `IP_RECVTOS`
     |
    ::: /.cargo/registry/src/git.luolix.top-1ecc6299db9ec823/libc-0.2.155/src/unix/bsd/freebsdlike/freebsd/mod.rs:3685:1
     |
3685 | pub const IP_RECVTOS: ::c_int = 68;
     | ----------------------------- similarly named constant `IP_RECVTOS` defined here

I think we need to enable RECVTTL only on linux.

On FreeBSD, IP_RECVTTL should be used, it is available on FreeBSD, our CI says it does not exist because the Rust libc crate does not include it, we need to add this constant to the libc crate.

Update: PR filed rust-lang/libc#3750

Update: PR merged, we can use the libc from git now:

libc = { git = "https://github.com/rust-lang/libc", branch = "libc-0.2", features = ["extra_traits"] }

src/sys/socket/sockopt.rs

src/sys/socket/mod.rs

crisidev · 2024-06-17T11:49:50Z

I am moving this back to draft, while I find some time to finish to implement the changes and fix all the tests.

SteveLauC · 2024-07-20T01:39:58Z

HI @crisidev, would you like to finish this? That type thing should be easy to deal with as we know the type used by the OS kernel:)

crisidev · 2024-07-20T12:57:47Z

Hey, sorry, life got in the middle.. I'd love to finish this, but I am finally on holidays for a couple of weeks. I will be able to restart working on this in the second week of August if that's ok..

SteveLauC · 2024-07-20T13:11:04Z

but I am finally on holidays for a couple of weeks. I will be able to restart working on this in the second week of August if that's ok..

Yeah, that is totally fine, enjoy you holiday, we all have a life😁

crisidev · 2024-07-21T15:33:31Z

but I am finally on holidays for a couple of weeks. I will be able to restart working on this in the second week of August if that's ok..

Yeah, that is totally fine, enjoy you holiday, we all have a life😁

I found some time during a lazy Sunday and I am trying to finish this 😄

CI is making my life very hard right now, I'll try to fix it and move this to non draft.

crisidev · 2024-07-21T15:59:03Z

I think I am done fixing CI issues. I had to disable the tests for IPTOS / IPV6TCLASS on mips since they return bogus values and I don't have a good way to troubleshoot it.

crisidev · 2024-07-21T16:06:54Z

@SteveLauC first of all, thanks for all the patient comments, I really appreciate the help. I think this is ready for review now!

SteveLauC

Well, sorry for so many comments, I hope they won't affect your holiday:)

Most of them are trivial cfg issues, so should be easy to fix

src/sys/socket/mod.rs

test/sys/test_sockopt.rs

test/sys/test_socket.rs

crisidev · 2024-07-22T08:27:46Z

Well, sorry for so many comments, I hope they won't affect your holiday:)

Most of them are trivial cfg issues, so should be easy to fix

Please don't you worry about this. I am quite new to this crate and without your help, I would be able to make a meaningful contribution. At the end, you did most of the work, I am really glad this is moving forward thanks to your help.

I'll try to fix everything today, I think it start to look good, apologies for the mess I did with cfg flags.

Co-authored-by: SteveLauC <stevelauc@outlook.com>

src/sys/socket/mod.rs

crisidev · 2024-07-22T15:51:12Z

I think I could use another review now :)

SteveLauC

Just one little thing, let me commit this change:)

test/sys/test_socket.rs

SteveLauC · 2024-07-22T23:53:16Z

Thanks!

crisidev added 2 commits June 3, 2024 18:38

Add PR changelog

27cac60

crisidev marked this pull request as ready for review June 3, 2024 17:45

crisidev added 5 commits June 3, 2024 18:49

This is not supported on Freebsd

4faed1b

IPV6_RECVTCLASS not supported on freebsd

342aa6b

Properly limit IPV6_RECVTCLASS

84fc5b1

Properly limit IP_TOS

72173b5

Restrict everything to target_os linux

64efe4e

crisidev marked this pull request as draft June 3, 2024 18:07

crisidev added 2 commits June 4, 2024 12:17

...

ee761a8

Protect bind

8f52422

crisidev marked this pull request as ready for review June 4, 2024 14:55

crisidev commented Jun 4, 2024

View reviewed changes

test/sys/test_socket.rs Show resolved Hide resolved

SteveLauC reviewed Jun 10, 2024

View reviewed changes

crisidev and others added 3 commits June 14, 2024 12:54

Apply suggestions from code review

be4a2de

Co-authored-by: SteveLauC <stevelauc@outlook.com>

Address PR comments

6e34f92

Run cargo fmt

13b2107

SteveLauC reviewed Jun 15, 2024

View reviewed changes

src/sys/socket/sockopt.rs Outdated Show resolved Hide resolved

src/sys/socket/mod.rs Show resolved Hide resolved

src/sys/socket/mod.rs Show resolved Hide resolved

SteveLauC mentioned this pull request Jun 15, 2024

feat: IP_RECVTTL/IPV6_RECVHOPLIMIT for FreeBSD/DragonFlyBSD rust-lang/libc#3750

Merged

SteveLauC reviewed Jun 15, 2024

View reviewed changes

src/sys/socket/mod.rs Outdated Show resolved Hide resolved

crisidev marked this pull request as draft June 17, 2024 11:50

Merge branch 'nix-rust:master' into master

c76237c

crisidev added 2 commits July 21, 2024 17:22

Address further comments from PR

efeac24

Run tests under qemu

3c1eed7

crisidev added 2 commits July 21, 2024 17:41

Use libc from git

4946d5f

Disable qemu IPTOS / IPV6TCLASS tests on mips

07691e7

crisidev marked this pull request as ready for review July 21, 2024 15:59

SteveLauC reviewed Jul 22, 2024

View reviewed changes

crisidev and others added 5 commits July 22, 2024 10:34

Apply suggestions from code review

0c48b03

Co-authored-by: SteveLauC <stevelauc@outlook.com>

Fix more code review suggestions

cfb4fde

Fix missing renames in tests

1be4b84

Testing

dffe259

Fixes

1337953

crisidev commented Jul 22, 2024

View reviewed changes

src/sys/socket/mod.rs Show resolved Hide resolved

crisidev added 4 commits July 22, 2024 16:27

Fix freebsd

72c00ee

Trigger CI again

684e6b2

Trigger CI again

349613c

Use the same control message in linux and freebsd for ipv4ttl

c842aa7

SteveLauC approved these changes Jul 22, 2024

View reviewed changes

test/sys/test_socket.rs Outdated Show resolved Hide resolved

test: remove a println

7fd1b3d

SteveLauC added this pull request to the merge queue Jul 22, 2024

Merged via the queue into nix-rust:master with commit 25b437c Jul 22, 2024
36 checks passed

SteveLauC mentioned this pull request Jul 23, 2024

chore: deprecate IpTos in favor of Ipv4Tos #2465

Merged

3 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: add support for DSCP and TTL / Hop Limit #2425

feat: add support for DSCP and TTL / Hop Limit #2425

crisidev commented Jun 3, 2024 •

edited

Loading

SteveLauC commented Jun 10, 2024 •

edited

Loading

crisidev commented Jun 11, 2024

crisidev commented Jun 14, 2024

SteveLauC commented Jun 15, 2024 •

edited

Loading

crisidev commented Jun 17, 2024

SteveLauC commented Jul 20, 2024

crisidev commented Jul 20, 2024

SteveLauC commented Jul 20, 2024 •

edited

Loading

crisidev commented Jul 21, 2024

crisidev commented Jul 21, 2024

crisidev commented Jul 21, 2024

SteveLauC left a comment •

edited

Loading

crisidev commented Jul 22, 2024

crisidev commented Jul 22, 2024

SteveLauC left a comment

SteveLauC commented Jul 22, 2024

feat: add support for DSCP and TTL / Hop Limit #2425

feat: add support for DSCP and TTL / Hop Limit #2425

Conversation

crisidev commented Jun 3, 2024 • edited Loading

What does this PR do

Checklist:

SteveLauC commented Jun 10, 2024 • edited Loading

crisidev commented Jun 11, 2024

crisidev commented Jun 14, 2024

SteveLauC commented Jun 15, 2024 • edited Loading

crisidev commented Jun 17, 2024

SteveLauC commented Jul 20, 2024

crisidev commented Jul 20, 2024

SteveLauC commented Jul 20, 2024 • edited Loading

crisidev commented Jul 21, 2024

crisidev commented Jul 21, 2024

crisidev commented Jul 21, 2024

SteveLauC left a comment • edited Loading

Choose a reason for hiding this comment

crisidev commented Jul 22, 2024

crisidev commented Jul 22, 2024

SteveLauC left a comment

Choose a reason for hiding this comment

SteveLauC commented Jul 22, 2024

crisidev commented Jun 3, 2024 •

edited

Loading

SteveLauC commented Jun 10, 2024 •

edited

Loading

SteveLauC commented Jun 15, 2024 •

edited

Loading

SteveLauC commented Jul 20, 2024 •

edited

Loading

SteveLauC left a comment •

edited

Loading