diff options
author | Alan Somers <asomers@gmail.com> | 2021-09-28 19:09:15 -0600 |
---|---|---|
committer | Alan Somers <asomers@gmail.com> | 2021-09-28 19:09:15 -0600 |
commit | 8d6c2b3a70c650e4aed47d735c9f236ee45e9d26 (patch) | |
tree | 2889c0b4e181adcddbdb659ad4c3833a2a2028b7 /src/sys/socket | |
parent | 759b34adea682c5434ea88cea5d666da816149cc (diff) | |
download | nix-8d6c2b3a70c650e4aed47d735c9f236ee45e9d26.zip |
Revert "Expose SockAddr::from_raw_sockaddr"
This reverts commit ed43d2c65e65dd68c9cf2dcf06f5ec45a44aaccd.
As discussed in #1544 the API of this function needs to change. For
now, revert the PR that made it public, because it has not yet been
included in any release.
Diffstat (limited to 'src/sys/socket')
-rw-r--r-- | src/sys/socket/addr.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sys/socket/addr.rs b/src/sys/socket/addr.rs index 832a153f..b119642b 100644 --- a/src/sys/socket/addr.rs +++ b/src/sys/socket/addr.rs @@ -802,7 +802,7 @@ impl SockAddr { /// unsafe because it takes a raw pointer as argument. The caller must /// ensure that the pointer is valid. #[cfg(not(target_os = "fuchsia"))] - pub unsafe fn from_raw_sockaddr(addr: *const libc::sockaddr) -> Option<SockAddr> { + pub(crate) unsafe fn from_libc_sockaddr(addr: *const libc::sockaddr) -> Option<SockAddr> { if addr.is_null() { None } else { @@ -1381,7 +1381,7 @@ mod tests { fn test_macos_loopback_datalink_addr() { let bytes = [20i8, 18, 1, 0, 24, 3, 0, 0, 108, 111, 48, 0, 0, 0, 0, 0]; let sa = bytes.as_ptr() as *const libc::sockaddr; - let _sock_addr = unsafe { SockAddr::from_raw_sockaddr(sa) }; + let _sock_addr = unsafe { SockAddr::from_libc_sockaddr(sa) }; assert!(_sock_addr.is_none()); } @@ -1396,7 +1396,7 @@ mod tests { let bytes = [20i8, 18, 7, 0, 6, 3, 6, 0, 101, 110, 48, 24, 101, -112, -35, 76, -80]; let ptr = bytes.as_ptr(); let sa = ptr as *const libc::sockaddr; - let _sock_addr = unsafe { SockAddr::from_raw_sockaddr(sa) }; + let _sock_addr = unsafe { SockAddr::from_libc_sockaddr(sa) }; assert!(_sock_addr.is_some()); @@ -1418,7 +1418,7 @@ mod tests { let bytes = [25u8, 0, 0, 0, 6, 0, 6, 0, 24, 101, 144, 221, 76, 176]; let ptr = bytes.as_ptr(); let sa = ptr as *const libc::sockaddr; - let _sock_addr = unsafe { SockAddr::from_raw_sockaddr(sa) }; + let _sock_addr = unsafe { SockAddr::from_libc_sockaddr(sa) }; assert!(_sock_addr.is_some()); |