openharmony/third_party_rust_nix
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_rust_nix synced 2024-12-04 13:56:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #1642

Browse Source 
1642: InetAddr::from_std should set sin_len/sin6_len on the BSDs r=asomers a=rtzoeller

Resolves #1246.

Co-authored-by: Ryan Zoeller <rtzoeller@rtzoeller.com>
This commit is contained in:
bors[bot] 2022-01-23 21:56:25 +00:00 committed by GitHub
commit ae2b7b3552
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -47,6 +47,10 @@ This project adheres to [Semantic Versioning](https://semver.org/).
(#[1639](https://github.com/nix-rust/nix/pull/1639))
### Fixed
- `InetAddr::from_std` now sets the `sin_len`/`sin6_len` fields on the BSDs.
(#[1642](https://github.com/nix-rust/nix/pull/1642))
### Removed
- Removed public access to the inner fields of `NetlinkAddr`, `AlgAddr`,

10
src/sys/socket/addr.rs
View File

@ -330,6 +330,11 @@ impl InetAddr {
match *std {
net::SocketAddr::V4(ref addr) => {
InetAddr::V4(libc::sockaddr_in {
#[cfg(any(target_os = "dragonfly", target_os = "freebsd",
target_os = "haiku", target_os = "hermit",
target_os = "ios", target_os = "macos",
target_os = "netbsd", target_os = "openbsd"))]
sin_len: mem::size_of::<libc::sockaddr_in>() as u8,
sin_family: AddressFamily::Inet as sa_family_t,
sin_port: addr.port().to_be(), // network byte order
sin_addr: Ipv4Addr::from_std(addr.ip()).0,
@ -338,6 +343,11 @@ impl InetAddr {
}
net::SocketAddr::V6(ref addr) => {
InetAddr::V6(libc::sockaddr_in6 {
#[cfg(any(target_os = "dragonfly", target_os = "freebsd",
target_os = "haiku", target_os = "hermit",
target_os = "ios", target_os = "macos",
target_os = "netbsd", target_os = "openbsd"))]
sin6_len: mem::size_of::<libc::sockaddr_in6>() as u8,
sin6_family: AddressFamily::Inet6 as sa_family_t,
sin6_port: addr.port().to_be(), // network byte order
sin6_addr: Ipv6Addr::from_std(addr.ip()).0,