Skip to content

Fix/ttl dscp portable sockopt constants #16

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
kristapssk wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix/ttl dscp portable sockopt constants #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3655536
fix(transport/ttl): use libc constants for IP_TTL/IP_MULTICAST_TTL
kristapssk Aug 11, 2026
fcecd95
fix(transport/dscp): use libc constants for IP_TOS
kristapssk Aug 11, 2026
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
23 changes: 11 additions & 12 deletions crates/hdds/src/transport/dscp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,23 +252,22 @@ fn set_socket2_tos_raw(socket: &Socket, tos: u8) -> io::Result<()> {
/// Set TOS on a raw file descriptor.
#[cfg(unix)]
fn set_tos_fd(fd: i32, tos: u8) -> io::Result<()> {
// IP_TOS = 1 on Linux
const IP_TOS: i32 = 1;
// IPPROTO_IP = 0
const IPPROTO_IP: i32 = 0;
// Use libc constants: IP_TOS differs per-OS (Linux=1, macOS/BSD=3)
let ip_tos: i32 = libc::IP_TOS;
let ipproto_ip: i32 = libc::IPPROTO_IP;

let tos_val = i32::from(tos);
// SAFETY:
// - fd is a valid socket descriptor (caller responsibility, obtained from UdpSocket::as_raw_fd())
// - IPPROTO_IP (0) and IP_TOS (1) are valid socket option constants
// - IPPROTO_IP and IP_TOS are valid socket option constants
// - tos_val is a stack-allocated i32, properly aligned
// - size_of::<i32>() correctly represents the option value size
// - setsockopt only modifies kernel socket state, no memory corruption possible
let result = unsafe {
libc::setsockopt(
fd,
IPPROTO_IP,
IP_TOS,
ipproto_ip,
ip_tos,
&tos_val as *const i32 as *const libc::c_void,
std::mem::size_of::<i32>() as libc::socklen_t,
)
Expand All @@ -295,23 +294,23 @@ pub fn get_socket_dscp(socket: &UdpSocket) -> Option<DscpClass> {
/// Get TOS from a raw file descriptor.
#[cfg(unix)]
fn get_tos_fd(fd: i32) -> Option<u8> {
const IP_TOS: i32 = 1;
const IPPROTO_IP: i32 = 0;
let ip_tos: i32 = libc::IP_TOS;
let ipproto_ip: i32 = libc::IPPROTO_IP;

let mut tos_val: i32 = 0;
let mut len: libc::socklen_t = std::mem::size_of::<i32>() as libc::socklen_t;

// SAFETY:
// - fd is a valid socket descriptor (caller responsibility)
// - IPPROTO_IP (0) and IP_TOS (1) are valid socket option constants
// - IPPROTO_IP and IP_TOS are valid socket option constants
// - tos_val is a mutable stack-allocated i32, properly aligned
// - len is initialized to size_of::<i32>() and passed by mutable reference
// - getsockopt writes at most len bytes to tos_val, which has sufficient space
let result = unsafe {
libc::getsockopt(
fd,
IPPROTO_IP,
IP_TOS,
ipproto_ip,
ip_tos,
&mut tos_val as *mut i32 as *mut libc::c_void,
&mut len,
)
Expand Down
36 changes: 18 additions & 18 deletions crates/hdds/src/transport/ttl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,9 @@ pub fn set_socket2_multicast_ttl(socket: &Socket, ttl: u8) -> io::Result<()> {
/// Set multicast TTL on a raw file descriptor.
#[cfg(unix)]
fn set_multicast_ttl_fd(fd: i32, ttl: u8) -> io::Result<()> {
// IP_MULTICAST_TTL = 33 on Linux
const IP_MULTICAST_TTL: i32 = 33;
const IPPROTO_IP: i32 = 0;
// Use libc constants: value differs per-OS (Linux=33, macOS/BSD=10)
let ip_multicast_ttl: i32 = libc::IP_MULTICAST_TTL;
let ipproto_ip: i32 = libc::IPPROTO_IP;

let ttl_val = i32::from(ttl);
// SAFETY:
Expand All @@ -187,8 +187,8 @@ fn set_multicast_ttl_fd(fd: i32, ttl: u8) -> io::Result<()> {
let result = unsafe {
libc::setsockopt(
fd,
IPPROTO_IP,
IP_MULTICAST_TTL,
ipproto_ip,
ip_multicast_ttl,
&ttl_val as *const i32 as *const libc::c_void,
std::mem::size_of::<i32>() as libc::socklen_t,
)
Expand Down Expand Up @@ -232,9 +232,9 @@ pub fn set_socket2_unicast_ttl(socket: &Socket, ttl: u8) -> io::Result<()> {
/// Set unicast TTL on a raw file descriptor.
#[cfg(unix)]
fn set_unicast_ttl_fd(fd: i32, ttl: u8) -> io::Result<()> {
// IP_TTL = 2 on Linux
const IP_TTL: i32 = 2;
const IPPROTO_IP: i32 = 0;
// Use libc constants: value differs per-OS (Linux=2, macOS/BSD=4)
let ip_ttl: i32 = libc::IP_TTL;
let ipproto_ip: i32 = libc::IPPROTO_IP;

let ttl_val = i32::from(ttl);
// SAFETY:
Expand All @@ -246,8 +246,8 @@ fn set_unicast_ttl_fd(fd: i32, ttl: u8) -> io::Result<()> {
let result = unsafe {
libc::setsockopt(
fd,
IPPROTO_IP,
IP_TTL,
ipproto_ip,
ip_ttl,
&ttl_val as *const i32 as *const libc::c_void,
std::mem::size_of::<i32>() as libc::socklen_t,
)
Expand Down Expand Up @@ -279,8 +279,8 @@ pub fn get_multicast_ttl(socket: &UdpSocket) -> Option<u8> {
/// Get multicast TTL from a raw file descriptor.
#[cfg(unix)]
fn get_multicast_ttl_fd(fd: i32) -> Option<u8> {
const IP_MULTICAST_TTL: i32 = 33;
const IPPROTO_IP: i32 = 0;
let ip_multicast_ttl: i32 = libc::IP_MULTICAST_TTL;
let ipproto_ip: i32 = libc::IPPROTO_IP;

let mut ttl_val: i32 = 0;
let mut len: libc::socklen_t = std::mem::size_of::<i32>() as libc::socklen_t;
Expand All @@ -294,8 +294,8 @@ fn get_multicast_ttl_fd(fd: i32) -> Option<u8> {
let result = unsafe {
libc::getsockopt(
fd,
IPPROTO_IP,
IP_MULTICAST_TTL,
ipproto_ip,
ip_multicast_ttl,
&mut ttl_val as *mut i32 as *mut libc::c_void,
&mut len,
)
Expand All @@ -319,8 +319,8 @@ pub fn get_unicast_ttl(socket: &UdpSocket) -> Option<u8> {
/// Get unicast TTL from a raw file descriptor.
#[cfg(unix)]
fn get_unicast_ttl_fd(fd: i32) -> Option<u8> {
const IP_TTL: i32 = 2;
const IPPROTO_IP: i32 = 0;
let ip_ttl: i32 = libc::IP_TTL;
let ipproto_ip: i32 = libc::IPPROTO_IP;

let mut ttl_val: i32 = 0;
let mut len: libc::socklen_t = std::mem::size_of::<i32>() as libc::socklen_t;
Expand All @@ -334,8 +334,8 @@ fn get_unicast_ttl_fd(fd: i32) -> Option<u8> {
let result = unsafe {
libc::getsockopt(
fd,
IPPROTO_IP,
IP_TTL,
ipproto_ip,
ip_ttl,
&mut ttl_val as *mut i32 as *mut libc::c_void,
&mut len,
)
Expand Down