Skip to content

Use IP_RECVTOS on DragonFly #2464

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

Open
mneumann wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use IP_RECVTOS on DragonFly #2464

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 19 additions & 19 deletions quinn-udp/src/unix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#[cfg(not(any(apple, target_os = "openbsd", solarish)))]
#[cfg(not(any(apple, target_os = "openbsd", target_os = "dragonfly", solarish)))]
use std::ptr;
use std::{
io::{self, IoSliceMut},
Expand Down Expand Up @@ -58,6 +58,18 @@ const IPV6_DONTFRAG: libc::c_int = 62;
#[cfg(not(any(target_os = "openbsd", target_os = "netbsd")))]
const IPV6_DONTFRAG: libc::c_int = libc::IPV6_DONTFRAG;

// Defined in netinet/in.h on DragonFly (since 4th December 2020) but not exported
// via Rust's libc crate.
Comment on lines +61 to +62
Copy link
Collaborator

@mxinden mxinden Dec 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In case there is a pull request for libc already, I suggest linking it here.

#[cfg(any(target_os = "dragonfly"))]
const IP_RECVTOS: libc::c_int = 68;
#[cfg(not(any(
target_os = "openbsd",
target_os = "netbsd",
target_os = "dragonfly",
solarish
)))]
const IP_RECVTOS: libc::c_int = libc::IP_RECVTOS;

#[cfg(target_os = "freebsd")]
type IpTosTy = libc::c_uchar;
#[cfg(not(any(target_os = "freebsd", target_os = "netbsd")))]
Expand Down Expand Up @@ -112,17 +124,10 @@ impl UdpSocketState {
let is_ipv4 = addr.family() == libc::AF_INET as libc::sa_family_t;

// mac and ios do not support IP_RECVTOS on dual-stack sockets :(
// older macos versions also don't have the flag and will error out if we don't ignore it
#[cfg(not(any(
target_os = "openbsd",
target_os = "netbsd",
target_os = "dragonfly",
solarish
)))]
// older macos versions also don't have the flag and will error out if we don't ignore it.
#[cfg(not(any(target_os = "openbsd", target_os = "netbsd", solarish)))]
if is_ipv4 || !io.only_v6()? {
if let Err(_err) =
set_socket_option(&*io, libc::IPPROTO_IP, libc::IP_RECVTOS, OPTION_ON)
{
if let Err(_err) = set_socket_option(&*io, libc::IPPROTO_IP, IP_RECVTOS, OPTION_ON) {
crate::log::debug!("Ignoring error setting IP_RECVTOS on socket: {_err:?}");
}
}
Expand Down Expand Up @@ -654,7 +659,7 @@ fn prepare_msg(
};
encoder.push(libc::IPPROTO_IP, libc::IP_PKTINFO, pktinfo);
}
#[cfg(any(bsd, apple, solarish))]
#[cfg(any(bsd, apple, solarish, target_os = "dragonfly"))]
{
if encode_src_ip {
let addr = libc::in_addr {
Expand Down Expand Up @@ -732,13 +737,8 @@ fn decode_recv(
ecn_bits = cmsg::decode::<u8, libc::cmsghdr>(cmsg);
},
// FreeBSD uses IP_RECVTOS here, and we can be liberal because cmsgs are opt-in.
#[cfg(not(any(
target_os = "openbsd",
target_os = "netbsd",
target_os = "dragonfly",
solarish
)))]
(libc::IPPROTO_IP, libc::IP_RECVTOS) => unsafe {
#[cfg(not(any(target_os = "openbsd", target_os = "netbsd", solarish)))]
(libc::IPPROTO_IP, IP_RECVTOS) => unsafe {
ecn_bits = cmsg::decode::<u8, libc::cmsghdr>(cmsg);
},
(libc::IPPROTO_IPV6, libc::IPV6_TCLASS) => unsafe {
Expand Down
Loading