Skip to content
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

Jump to bottom

Fix byte-swapped flowinfo and scope_id #1969

Closed
wants to merge 1 commit into from
Closed

Fix byte-swapped flowinfo and scope_id #1969

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 25 additions & 4 deletions src/sys/socket/addr.rs
View file
Open in desktop
Expand Up @@ -1180,10 +1180,10 @@ impl From<net::SocketAddrV6> for SockaddrIn6 {
impl From<SockaddrIn6> for net::SocketAddrV6 {
fn from(addr: SockaddrIn6) -> Self {
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.ip(),
addr.port(),
addr.flowinfo(),
addr.scope_id(),
)
}
}
Expand Down Expand Up @@ -2489,8 +2489,16 @@ mod tests {

mod sockaddr_in {
use super::*;
use std::net::SocketAddrV4;
use std::str::FromStr;

#[test]
fn roundtrip_std_socketaddrv4() {
let addr = SocketAddrV4::new("1.2.3.4".parse().unwrap(), 0x0102);
let s = SockaddrIn::from(addr);
assert_eq!(SocketAddrV4::from(s), addr);
}

#[test]
fn display() {
let s = "127.0.0.1:8080";
Expand All @@ -2509,8 +2517,21 @@ mod tests {

mod sockaddr_in6 {
use super::*;
use std::net::SocketAddrV6;
use std::str::FromStr;

#[test]
fn roundtrip_std_socketaddrv6() {
let addr = SocketAddrV6::new(
"1234:5678:90ab:cdef::1111:2222".parse().unwrap(),
0x0102,
0x01020304,
0x01020304,
);
let s = SockaddrIn6::from(addr);
assert_eq!(SocketAddrV6::from(s), addr);
}

#[test]
fn display() {
let s = "[1234:5678:90ab:cdef::1111:2222]:8080";
Expand Down