diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2023-01-13 03:06:07 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-13 03:06:07 +0000 |
commit | c5d6732a4254dee0423f83efbb6601104436da6d (patch) | |
tree | ac20c1a4ddb9a4c31726b5aa1448565f9cfc67e6 /src/sys | |
parent | ef70d9e28fcd085d44495607003639a350a859cd (diff) | |
parent | cfe689a11e963fb07ee08bf8277cece9d9ea382a (diff) | |
download | nix-c5d6732a4254dee0423f83efbb6601104436da6d.zip |
Merge #1964
1964: Fix endian swap on SocketAddrV6. r=asomers a=aarond10
This is a bug. flowinfo and scope_id should not be byte swapped here.
See also https://github.com/nix-rust/nix/issues/1963.
Co-authored-by: Aaron Drew <aarond10@gmail.com>
Diffstat (limited to 'src/sys')
-rw-r--r-- | src/sys/socket/addr.rs | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/sys/socket/addr.rs b/src/sys/socket/addr.rs index 4e36ca47..aad407a7 100644 --- a/src/sys/socket/addr.rs +++ b/src/sys/socket/addr.rs @@ -1182,8 +1182,8 @@ impl From<SockaddrIn6> for net::SocketAddrV6 { net::SocketAddrV6::new( net::Ipv6Addr::from(addr.0.sin6_addr.s6_addr), u16::from_be(addr.0.sin6_port), - u32::from_be(addr.0.sin6_flowinfo), - u32::from_be(addr.0.sin6_scope_id), + addr.0.sin6_flowinfo, + addr.0.sin6_scope_id, ) } } @@ -2525,6 +2525,18 @@ mod tests { SockaddrIn6::size() as usize ); } + + #[test] + // Ensure that we can convert to-and-from std::net variants without change. + fn to_and_from() { + let s = "[1234:5678:90ab:cdef::1111:2222]:8080"; + let mut nix_sin6 = SockaddrIn6::from_str(s).unwrap(); + nix_sin6.0.sin6_flowinfo = 0x12345678; + nix_sin6.0.sin6_scope_id = 0x9abcdef0; + + let std_sin6 : std::net::SocketAddrV6 = nix_sin6.into(); + assert_eq!(nix_sin6, std_sin6.into()); + } } mod sockaddr_storage { |