Skip to content

Commit

Permalink
fix ControlMessageOwned::UdpGroSegments UDP packets processing type. (#…
Browse files Browse the repository at this point in the history
…2406)

* fix ControlMessageOwned::UdpGroSegments UDP packets processing type.

The kernel, since 5.0, process the segmentation offload with a signed
int.

close #2403.

* changelog
  • Loading branch information
devnexen committed May 22, 2024
1 parent 208b80b commit f743197
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions changelog/2406.fixed.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed ControlMessageOwned::UdpGroSegments wrapped type from u16 to i32 to reflect the used kernel's one.
4 changes: 2 additions & 2 deletions src/sys/socket/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -780,7 +780,7 @@ pub enum ControlMessageOwned {
#[cfg(target_os = "linux")]
#[cfg(feature = "net")]
#[cfg_attr(docsrs, doc(cfg(feature = "net")))]
UdpGroSegments(u16),
UdpGroSegments(i32),

/// SO_RXQ_OVFL indicates that an unsigned 32 bit value
/// ancilliary msg (cmsg) should be attached to recieved
Expand Down Expand Up @@ -956,7 +956,7 @@ impl ControlMessageOwned {
#[cfg(target_os = "linux")]
#[cfg(feature = "net")]
(libc::SOL_UDP, libc::UDP_GRO) => {
let gso_size: u16 = unsafe { ptr::read_unaligned(p as *const _) };
let gso_size: i32 = unsafe { ptr::read_unaligned(p as *const _) };
ControlMessageOwned::UdpGroSegments(gso_size)
},
#[cfg(any(linux_android, target_os = "fuchsia"))]
Expand Down

0 comments on commit f743197

Please sign in to comment.