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

Improve the sockaddr interface: #1614

Merged
merged 1 commit into from
Dec 24, 2021
Merged

Improve the sockaddr interface: #1614

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ This project adheres to [Semantic Versioning](https://semver.org/).
### Fixed
### Removed

- Removed public access to the inner fields of `NetlinkAddr`, `AlgAddr`,
`SysControlAddr`, `LinkAddr`, and `VsockAddr`.
(#[1614](https://github.com/nix-rust/nix/pull/1614))

## [0.23.1] - 2021-12-16

### Added
Expand Down
21 changes: 14 additions & 7 deletions src/sys/socket/addr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,7 @@ impl fmt::Display for IpAddr {
*/

#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
#[repr(transparent)]
pub struct Ipv4Addr(pub libc::in_addr);

impl Ipv4Addr {
Expand Down Expand Up @@ -522,6 +523,7 @@ impl fmt::Display for Ipv4Addr {
*/

#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
#[repr(transparent)]
pub struct Ipv6Addr(pub libc::in6_addr);

// Note that IPv6 addresses are stored in big endian order on all architectures.
Expand Down Expand Up @@ -1062,7 +1064,8 @@ pub mod netlink {
use std::{fmt, mem};

#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq)]
pub struct NetlinkAddr(pub sockaddr_nl);
#[repr(transparent)]
pub struct NetlinkAddr(pub(in super::super) sockaddr_nl);

impl NetlinkAddr {
pub fn new(pid: u32, groups: u32) -> NetlinkAddr {
Expand Down Expand Up @@ -1099,7 +1102,8 @@ pub mod alg {
use std::ffi::CStr;

#[derive(Copy, Clone)]
pub struct AlgAddr(pub sockaddr_alg);
#[repr(transparent)]
pub struct AlgAddr(pub(in super::super) sockaddr_alg);

// , PartialEq, Eq, Debug, Hash
impl PartialEq for AlgAddr {
Expand Down Expand Up @@ -1179,9 +1183,9 @@ pub mod sys_control {

ioctl_readwrite!(ctl_info, CTL_IOC_MAGIC, CTL_IOC_INFO, ctl_ioc_info);

#[repr(C)]
#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
pub struct SysControlAddr(pub libc::sockaddr_ctl);
#[repr(transparent)]
pub struct SysControlAddr(pub(in super::super) libc::sockaddr_ctl);

impl SysControlAddr {
pub const fn new(id: u32, unit: u32) -> SysControlAddr {
Expand Down Expand Up @@ -1238,7 +1242,8 @@ mod datalink {

/// Hardware Address
#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
pub struct LinkAddr(pub libc::sockaddr_ll);
#[repr(transparent)]
pub struct LinkAddr(pub(in super::super) libc::sockaddr_ll);

impl LinkAddr {
/// Always AF_PACKET
Expand Down Expand Up @@ -1315,7 +1320,8 @@ mod datalink {

/// Hardware Address
#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
pub struct LinkAddr(pub libc::sockaddr_dl);
#[repr(transparent)]
pub struct LinkAddr(pub(in super::super) libc::sockaddr_dl);

impl LinkAddr {
/// Total length of sockaddr
Expand Down Expand Up @@ -1408,7 +1414,8 @@ pub mod vsock {
use std::hash::{Hash, Hasher};

#[derive(Copy, Clone)]
pub struct VsockAddr(pub sockaddr_vm);
#[repr(transparent)]
pub struct VsockAddr(pub(in super::super) sockaddr_vm);

impl PartialEq for VsockAddr {
fn eq(&self, other: &Self) -> bool {
Expand Down