hackclub/burrow
1
0
Fork 0
Code Pull requests Releases Packages Activity Actions 4

tun: Initial work on getting/setting netmask

Browse source 
Seems to run into an issue with setting netmasks like 255.0.0.0 with an
"AddressNotAvailable" error
This commit is contained in:
Cara Salter 2023-04-29 19:50:10 -04:00
parent c444bf293e
commit 6ea4b596c2
2 changed files with 36 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

33
tun/src/unix/linux/mod.rs
View file

@ -75,6 +75,16 @@ impl TunInterface {
self.perform(|fd| unsafe { sys::if_set_mtu(fd, &iff) })?; self.perform(|fd| unsafe { sys::if_set_mtu(fd, &iff) })?;
} }
#[throws]
pub fn set_netmask(&self, addr: Ipv4Addr) {
let addr = SockAddr::from(SocketAddrV4::new(addr, 0));
let mut iff = self.ifreq()?;
iff.ifr_ifru.ifru_netmask = unsafe { *addr.as_ptr() };
self.perform(|fd| unsafe { sys::if_set_netmask(fd, &iff) })?;
}
#[throws] #[throws]
pub fn ipv4_addr(&self) -> Ipv4Addr { pub fn ipv4_addr(&self) -> Ipv4Addr {
let mut iff = self.ifreq()?; let mut iff = self.ifreq()?;
@ -92,6 +102,17 @@ impl TunInterface {
mtu mtu
} }
#[throws]
pub fn netmask(&self) -> Ipv4Addr {
let mut iff = self.ifreq()?;
self.perform(|fd| unsafe { sys::if_get_netmask(fd, &mut iff) })?;
let netmask =
unsafe { *(&iff.ifr_ifru.ifru_netmask as *const _ as *const sys::sockaddr_in) };
Ipv4Addr::from(u32::from_be(netmask.sin_addr.s_addr))
}
#[throws] #[throws]
fn perform<R>(&self, perform: impl FnOnce(RawFd) -> Result<R, nix::Error>) -> R { fn perform<R>(&self, perform: impl FnOnce(RawFd) -> Result<R, nix::Error>) -> R {
let socket = Socket::new(Domain::IPV4, Type::DGRAM, None)?; let socket = Socket::new(Domain::IPV4, Type::DGRAM, None)?;
@ -101,6 +122,7 @@ impl TunInterface {
mod test { mod test {
use super::TunInterface; use super::TunInterface;
use std::net::Ipv4Addr;
#[test] #[test]
fn mtu() { fn mtu() {
@ -110,4 +132,15 @@ mod test {
assert_eq!(interf.mtu().unwrap(), 500); assert_eq!(interf.mtu().unwrap(), 500);
} }
#[test]
fn netmask() {
let interf = TunInterface::new().unwrap();
let addr = Ipv4Addr::new(255, 0, 0, 0);
interf.set_netmask(addr);
assert_eq!(interf.netmask().unwrap(), addr);
}
} }

3
tun/src/unix/linux/sys.rs
View file

@ -2,6 +2,7 @@ use nix::{ioctl_read_bad, ioctl_write_ptr_bad, request_code_read, request_code_w
use std::mem::size_of; use std::mem::size_of;
pub use libc::ifreq; pub use libc::ifreq;
pub use libc::sockaddr;
pub use libc::sockaddr_in; pub use libc::sockaddr_in;
ioctl_write_ptr_bad!( ioctl_write_ptr_bad!(
@ -17,6 +18,8 @@ ioctl_read_bad!(
ioctl_read_bad!(if_get_index, libc::SIOCGIFINDEX, libc::ifreq); ioctl_read_bad!(if_get_index, libc::SIOCGIFINDEX, libc::ifreq);
ioctl_read_bad!(if_get_addr, libc::SIOCGIFADDR, libc::ifreq); ioctl_read_bad!(if_get_addr, libc::SIOCGIFADDR, libc::ifreq);
ioctl_read_bad!(if_get_mtu, libc::SIOCGIFMTU, libc::ifreq); ioctl_read_bad!(if_get_mtu, libc::SIOCGIFMTU, libc::ifreq);
ioctl_read_bad!(if_get_netmask, libc::SIOCGIFNETMASK, libc::ifreq);
ioctl_write_ptr_bad!(if_set_addr, libc::SIOCSIFADDR, libc::ifreq); ioctl_write_ptr_bad!(if_set_addr, libc::SIOCSIFADDR, libc::ifreq);
ioctl_write_ptr_bad!(if_set_mtu, libc::SIOCSIFMTU, libc::ifreq); ioctl_write_ptr_bad!(if_set_mtu, libc::SIOCSIFMTU, libc::ifreq);
ioctl_write_ptr_bad!(if_set_netmask, libc::SIOCSIFNETMASK, libc::ifreq);