diff options
author | bors <bors@rust-lang.org> | 2018-04-12 15:31:20 +0000 |
---|---|---|
committer | bors <bors@rust-lang.org> | 2018-04-12 15:31:20 +0000 |
commit | 28b4d1630989318c4a03cacdffd3f8f7651262f4 (patch) | |
tree | 280a410763e2fed52a2240f8efdd8db5c93b3007 | |
parent | 540d7bbd9a8ef5a7a0dff314b1b5f5b3b1763319 (diff) | |
parent | c8e9232f3dfb9016a560acc20b8440a3ca6697ac (diff) | |
download | rust-libc-28b4d1630989318c4a03cacdffd3f8f7651262f4.tar.gz |
Auto merge of #971 - faern:public-netlink-fields, r=alexcrichton
Make netlink struct fields public
I realized my netlink structs were a bit unusable if their fields are not public :man_facepalming:
Follow up and improvement to #922
-rw-r--r-- | src/unix/notbsd/android/mod.rs | 46 | ||||
-rw-r--r-- | src/unix/notbsd/linux/mips/mod.rs | 40 | ||||
-rw-r--r-- | src/unix/notbsd/linux/mod.rs | 6 | ||||
-rw-r--r-- | src/unix/notbsd/linux/other/mod.rs | 40 |
4 files changed, 66 insertions, 66 deletions
diff --git a/src/unix/notbsd/android/mod.rs b/src/unix/notbsd/android/mod.rs index 22043fdbfd..239770edd4 100644 --- a/src/unix/notbsd/android/mod.rs +++ b/src/unix/notbsd/android/mod.rs @@ -187,47 +187,47 @@ s! { } pub struct genlmsghdr { - cmd: u8, - version: u8, - reserved: u16, + pub cmd: u8, + pub version: u8, + pub reserved: u16, } pub struct nlmsghdr { - nlmsg_len: u32, - nlmsg_type: u16, - nlmsg_flags: u16, - nlmsg_seq: u32, - nlmsg_pid: u32, + pub nlmsg_len: u32, + pub nlmsg_type: u16, + pub nlmsg_flags: u16, + pub nlmsg_seq: u32, + pub nlmsg_pid: u32, } pub struct nlmsgerr { - error: ::c_int, - msg: nlmsghdr, + pub error: ::c_int, + pub msg: nlmsghdr, } pub struct nl_pktinfo { - group: u32, + pub group: u32, } pub struct nl_mmap_req { - nm_block_size: ::c_uint, - nm_block_nr: ::c_uint, - nm_frame_size: ::c_uint, - nm_frame_nr: ::c_uint, + pub nm_block_size: ::c_uint, + pub nm_block_nr: ::c_uint, + pub nm_frame_size: ::c_uint, + pub nm_frame_nr: ::c_uint, } pub struct nl_mmap_hdr { - nm_status: ::c_uint, - nm_len: ::c_uint, - nm_group: u32, - nm_pid: u32, - nm_uid: u32, - nm_gid: u32, + pub nm_status: ::c_uint, + pub nm_len: ::c_uint, + pub nm_group: u32, + pub nm_pid: u32, + pub nm_uid: u32, + pub nm_gid: u32, } pub struct nlattr { - nla_len: u16, - nla_type: u16, + pub nla_len: u16, + pub nla_type: u16, } } diff --git a/src/unix/notbsd/linux/mips/mod.rs b/src/unix/notbsd/linux/mips/mod.rs index f3d19d33bd..833a3210cc 100644 --- a/src/unix/notbsd/linux/mips/mod.rs +++ b/src/unix/notbsd/linux/mips/mod.rs @@ -41,41 +41,41 @@ s! { } pub struct nlmsghdr { - nlmsg_len: u32, - nlmsg_type: u16, - nlmsg_flags: u16, - nlmsg_seq: u32, - nlmsg_pid: u32, + pub nlmsg_len: u32, + pub nlmsg_type: u16, + pub nlmsg_flags: u16, + pub nlmsg_seq: u32, + pub nlmsg_pid: u32, } pub struct nlmsgerr { - error: ::c_int, - msg: nlmsghdr, + pub error: ::c_int, + pub msg: nlmsghdr, } pub struct nl_pktinfo { - group: u32, + pub group: u32, } pub struct nl_mmap_req { - nm_block_size: ::c_uint, - nm_block_nr: ::c_uint, - nm_frame_size: ::c_uint, - nm_frame_nr: ::c_uint, + pub nm_block_size: ::c_uint, + pub nm_block_nr: ::c_uint, + pub nm_frame_size: ::c_uint, + pub nm_frame_nr: ::c_uint, } pub struct nl_mmap_hdr { - nm_status: ::c_uint, - nm_len: ::c_uint, - nm_group: u32, - nm_pid: u32, - nm_uid: u32, - nm_gid: u32, + pub nm_status: ::c_uint, + pub nm_len: ::c_uint, + pub nm_group: u32, + pub nm_pid: u32, + pub nm_uid: u32, + pub nm_gid: u32, } pub struct nlattr { - nla_len: u16, - nla_type: u16, + pub nla_len: u16, + pub nla_type: u16, } } diff --git a/src/unix/notbsd/linux/mod.rs b/src/unix/notbsd/linux/mod.rs index 723f7359b3..956a797b76 100644 --- a/src/unix/notbsd/linux/mod.rs +++ b/src/unix/notbsd/linux/mod.rs @@ -465,9 +465,9 @@ s! { } pub struct genlmsghdr { - cmd: u8, - version: u8, - reserved: u16, + pub cmd: u8, + pub version: u8, + pub reserved: u16, } } diff --git a/src/unix/notbsd/linux/other/mod.rs b/src/unix/notbsd/linux/other/mod.rs index f147576e14..a95359224f 100644 --- a/src/unix/notbsd/linux/other/mod.rs +++ b/src/unix/notbsd/linux/other/mod.rs @@ -180,41 +180,41 @@ s! { } pub struct nlmsghdr { - nlmsg_len: u32, - nlmsg_type: u16, - nlmsg_flags: u16, - nlmsg_seq: u32, - nlmsg_pid: u32, + pub nlmsg_len: u32, + pub nlmsg_type: u16, + pub nlmsg_flags: u16, + pub nlmsg_seq: u32, + pub nlmsg_pid: u32, } pub struct nlmsgerr { - error: ::c_int, - msg: nlmsghdr, + pub error: ::c_int, + pub msg: nlmsghdr, } pub struct nl_pktinfo { - group: u32, + pub group: u32, } pub struct nl_mmap_req { - nm_block_size: ::c_uint, - nm_block_nr: ::c_uint, - nm_frame_size: ::c_uint, - nm_frame_nr: ::c_uint, + pub nm_block_size: ::c_uint, + pub nm_block_nr: ::c_uint, + pub nm_frame_size: ::c_uint, + pub nm_frame_nr: ::c_uint, } pub struct nl_mmap_hdr { - nm_status: ::c_uint, - nm_len: ::c_uint, - nm_group: u32, - nm_pid: u32, - nm_uid: u32, - nm_gid: u32, + pub nm_status: ::c_uint, + pub nm_len: ::c_uint, + pub nm_group: u32, + pub nm_pid: u32, + pub nm_uid: u32, + pub nm_gid: u32, } pub struct nlattr { - nla_len: u16, - nla_type: u16, + pub nla_len: u16, + pub nla_type: u16, } } |