mirrors/crosvm
1
0
Fork 0
mirror of https://chromium.googlesource.com/crosvm/crosvm synced 2024-12-01 04:28:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net_sys: regenerate if.h bindings using Rust native union

Browse source 
TEST=crosvm run, network still works
     cargo test -p net_util
BUG=chromium:761517

Change-Id: I3ee0e43376ff7f2ba76202138e47505c73958087
Reviewed-on: https://chromium-review.googlesource.com/1623557
Commit-Ready: Zach Reizner <zachr@chromium.org>
Tested-by: Zach Reizner <zachr@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Legacy-Commit-Queue: Commit Bot <commit-bot@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Reviewed-by: Stephen Barber <smbarber@chromium.org>
This commit is contained in:
Zach Reizner 2019-05-21 17:16:39 -07:00 committed by chrome-bot
parent 90c3271ce5
commit 2b570f698a
2 changed files with 663 additions and 2706 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3296
net_sys/src/iff.rs
View file

File diff suppressed because it is too large Load diff

73
net_util/src/lib.rs
View file

@ -165,7 +165,7 @@ impl Display for MacAddress {
#[derive(Debug)] #[derive(Debug)]
pub struct Tap { pub struct Tap {
tap_file: File, tap_file: File,
if_name: [u8; 16usize], if_name: [c_char; 16usize],
if_flags: ::std::os::raw::c_short, if_flags: ::std::os::raw::c_short,
} }
@ -183,8 +183,8 @@ impl Tap {
Ok(Tap { Ok(Tap {
tap_file, tap_file,
if_name: *ifreq.ifr_ifrn.ifrn_name.as_ref(), if_name: ifreq.ifr_ifrn.ifrn_name,
if_flags: *ifreq.ifr_ifru.ifru_flags.as_ref(), if_flags: ifreq.ifr_ifru.ifru_flags,
}) })
} }
} }
@ -253,10 +253,11 @@ impl TapT for Tap {
let mut ifreq: net_sys::ifreq = Default::default(); let mut ifreq: net_sys::ifreq = Default::default();
unsafe { unsafe {
let ifrn_name = ifreq.ifr_ifrn.ifrn_name.as_mut(); let ifrn_name = ifreq.ifr_ifrn.ifrn_name.as_mut();
let ifru_flags = ifreq.ifr_ifru.ifru_flags.as_mut();
let name_slice = &mut ifrn_name[..TUNTAP_DEV_FORMAT.len()]; let name_slice = &mut ifrn_name[..TUNTAP_DEV_FORMAT.len()];
name_slice.copy_from_slice(TUNTAP_DEV_FORMAT); for (dst, src) in name_slice.iter_mut().zip(TUNTAP_DEV_FORMAT.iter()) {
*ifru_flags = (net_sys::IFF_TAP *dst = *src as c_char;
}
ifreq.ifr_ifru.ifru_flags = (net_sys::IFF_TAP
| net_sys::IFF_NO_PI | net_sys::IFF_NO_PI
| if vnet_hdr { net_sys::IFF_VNET_HDR } else { 0 }) | if vnet_hdr { net_sys::IFF_VNET_HDR } else { 0 })
as c_short; as c_short;
@ -278,8 +279,8 @@ impl TapT for Tap {
// Safe since only the name is accessed, and it's copied out. // Safe since only the name is accessed, and it's copied out.
Ok(Tap { Ok(Tap {
tap_file: tuntap, tap_file: tuntap,
if_name: unsafe { *ifreq.ifr_ifrn.ifrn_name.as_ref() }, if_name: unsafe { ifreq.ifr_ifrn.ifrn_name },
if_flags: unsafe { *ifreq.ifr_ifru.ifru_flags.as_ref() }, if_flags: unsafe { ifreq.ifr_ifru.ifru_flags },
}) })
} }
@ -296,9 +297,9 @@ impl TapT for Tap {
} }
// We only access one field of the ifru union, hence this is safe. // We only access one field of the ifru union, hence this is safe.
let addr = unsafe { ifreq.ifr_ifru.ifru_addr.as_ref() }; let addr = unsafe { ifreq.ifr_ifru.ifru_addr };
Ok(read_ipv4_addr(addr)) Ok(read_ipv4_addr(&addr))
} }
fn set_ip_addr(&self, ip_addr: net::Ipv4Addr) -> Result<()> { fn set_ip_addr(&self, ip_addr: net::Ipv4Addr) -> Result<()> {
@ -306,12 +307,7 @@ impl TapT for Tap {
let addr = create_sockaddr(ip_addr); let addr = create_sockaddr(ip_addr);
let mut ifreq = self.get_ifreq(); let mut ifreq = self.get_ifreq();
ifreq.ifr_ifru.ifru_addr = addr;
// We only access one field of the ifru union, hence this is safe.
unsafe {
let ifru_addr = ifreq.ifr_ifru.ifru_addr.as_mut();
*ifru_addr = addr;
}
// ioctl is safe. Called with a valid sock fd, and we check the return. // ioctl is safe. Called with a valid sock fd, and we check the return.
let ret = let ret =
@ -340,9 +336,9 @@ impl TapT for Tap {
} }
// We only access one field of the ifru union, hence this is safe. // We only access one field of the ifru union, hence this is safe.
let addr = unsafe { ifreq.ifr_ifru.ifru_netmask.as_ref() }; let addr = unsafe { ifreq.ifr_ifru.ifru_netmask };
Ok(read_ipv4_addr(addr)) Ok(read_ipv4_addr(&addr))
} }
fn set_netmask(&self, netmask: net::Ipv4Addr) -> Result<()> { fn set_netmask(&self, netmask: net::Ipv4Addr) -> Result<()> {
@ -350,12 +346,7 @@ impl TapT for Tap {
let addr = create_sockaddr(netmask); let addr = create_sockaddr(netmask);
let mut ifreq = self.get_ifreq(); let mut ifreq = self.get_ifreq();
ifreq.ifr_ifru.ifru_netmask = addr;
// We only access one field of the ifru union, hence this is safe.
unsafe {
let ifru_addr = ifreq.ifr_ifru.ifru_netmask.as_mut();
*ifru_addr = addr;
}
// ioctl is safe. Called with a valid sock fd, and we check the return. // ioctl is safe. Called with a valid sock fd, and we check the return.
let ret = let ret =
@ -384,11 +375,9 @@ impl TapT for Tap {
} }
// We only access one field of the ifru union, hence this is safe. // We only access one field of the ifru union, hence this is safe.
let ifru_hwaddr = unsafe { ifreq.ifr_ifru.ifru_hwaddr.as_ref() };
// This is safe since the MacAddress struct is already sized to match the C sockaddr // This is safe since the MacAddress struct is already sized to match the C sockaddr
// struct. The address family has also been checked. // struct. The address family has also been checked.
Ok(unsafe { mem::transmute(*ifru_hwaddr) }) Ok(unsafe { mem::transmute(ifreq.ifr_ifru.ifru_hwaddr) })
} }
fn set_mac_address(&self, mac_addr: MacAddress) -> Result<()> { fn set_mac_address(&self, mac_addr: MacAddress) -> Result<()> {
@ -398,10 +387,9 @@ impl TapT for Tap {
// We only access one field of the ifru union, hence this is safe. // We only access one field of the ifru union, hence this is safe.
unsafe { unsafe {
let ifru_hwaddr = ifreq.ifr_ifru.ifru_hwaddr.as_mut();
// This is safe since the MacAddress struct is already sized to match the C sockaddr // This is safe since the MacAddress struct is already sized to match the C sockaddr
// struct. // struct.
*ifru_hwaddr = std::mem::transmute(mac_addr); ifreq.ifr_ifru.ifru_hwaddr = std::mem::transmute(mac_addr);
} }
// ioctl is safe. Called with a valid sock fd, and we check the return. // ioctl is safe. Called with a valid sock fd, and we check the return.
@ -429,13 +417,8 @@ impl TapT for Tap {
let sock = create_socket()?; let sock = create_socket()?;
let mut ifreq = self.get_ifreq(); let mut ifreq = self.get_ifreq();
ifreq.ifr_ifru.ifru_flags =
// We only access one field of the ifru union, hence this is safe. (net_sys::net_device_flags_IFF_UP | net_sys::net_device_flags_IFF_RUNNING) as i16;
unsafe {
let ifru_flags = ifreq.ifr_ifru.ifru_flags.as_mut();
*ifru_flags =
(net_sys::net_device_flags_IFF_UP | net_sys::net_device_flags_IFF_RUNNING) as i16;
}
// ioctl is safe. Called with a valid sock fd, and we check the return. // ioctl is safe. Called with a valid sock fd, and we check the return.
let ret = let ret =
@ -469,13 +452,7 @@ impl TapT for Tap {
// This sets the flags with which the interface was created, which is the only entry we set // This sets the flags with which the interface was created, which is the only entry we set
// on the second union. // on the second union.
unsafe { ifreq.ifr_ifru.ifru_flags = self.if_flags;
ifreq
.ifr_ifru
.ifru_flags
.as_mut()
.clone_from(&self.if_flags);
}
ifreq ifreq
} }
@ -657,16 +634,6 @@ mod tests {
assert_ok_or_perm_denied(ret); assert_ok_or_perm_denied(ret);
} }
#[test]
fn tap_get_ifreq() {
let tap = Tap::new(true).unwrap();
let ret = tap.get_ifreq();
assert_eq!(
"__BindgenUnionField",
format!("{:?}", ret.ifr_ifrn.ifrn_name)
);
}
fn assert_ok_or_perm_denied<T>(res: Result<T>) { fn assert_ok_or_perm_denied<T>(res: Result<T>) {
match res { match res {
// We won't have permission in test environments; allow that // We won't have permission in test environments; allow that