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

Log when TunInterface is configured

Browse source 
This uses info from the log package.
This commit is contained in:
Sam Poder 2023-06-29 20:26:06 +00:00 • committed by Conrad Kramer
parent beae8c0f79
commit 9eb661ebd5
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tun/src/unix/apple/mod.rs
View file

@ -1,6 +1,7 @@
use byteorder::{ByteOrder, NetworkEndian}; use byteorder::{ByteOrder, NetworkEndian};
use fehler::throws; use fehler::throws;
use libc::{c_char, iovec, writev, AF_INET, AF_INET6}; use libc::{c_char, iovec, writev, AF_INET, AF_INET6};
use log::info;
use socket2::{Domain, SockAddr, Socket, Type}; use socket2::{Domain, SockAddr, Socket, Type};
use std::io::IoSlice; use std::io::IoSlice;
use std::net::{Ipv4Addr, SocketAddrV4}; use std::net::{Ipv4Addr, SocketAddrV4};
@ -70,11 +71,10 @@ impl TunInterface {
#[throws] #[throws]
pub fn set_ipv4_addr(&self, addr: Ipv4Addr) { pub fn set_ipv4_addr(&self, addr: Ipv4Addr) {
let addr = SockAddr::from(SocketAddrV4::new(addr, 0)); let addr = SockAddr::from(SocketAddrV4::new(addr, 0));
let mut iff = self.ifreq()?; let mut iff = self.ifreq()?;
iff.ifr_ifru.ifru_addr = unsafe { *addr.as_ptr() }; iff.ifr_ifru.ifru_addr = unsafe { *addr.as_ptr() };
self.perform(|fd| unsafe { sys::if_set_addr(fd, &iff) })?; self.perform(|fd| unsafe { sys::if_set_addr(fd, &iff) })?;
info!("ipv4_addr_set: {:?} (fd: {:?})", addr, self.as_raw_fd())
} }
#[throws] #[throws]
@ -105,6 +105,7 @@ impl TunInterface {
let mut iff = self.ifreq()?; let mut iff = self.ifreq()?;
iff.ifr_ifru.ifru_mtu = mtu; iff.ifr_ifru.ifru_mtu = mtu;
self.perform(|fd| unsafe { sys::if_set_mtu(fd, &iff) })?; self.perform(|fd| unsafe { sys::if_set_mtu(fd, &iff) })?;
info!("mtu_set: {:?} (fd: {:?})", mtu, self.as_raw_fd())
} }
#[throws] #[throws]
@ -121,11 +122,14 @@ impl TunInterface {
#[throws] #[throws]
pub fn set_netmask(&self, addr: Ipv4Addr) { pub fn set_netmask(&self, addr: Ipv4Addr) {
let addr = SockAddr::from(SocketAddrV4::new(addr, 0)); let addr = SockAddr::from(SocketAddrV4::new(addr, 0));
let mut iff = self.ifreq()?; let mut iff = self.ifreq()?;
iff.ifr_ifru.ifru_netmask = unsafe { *addr.as_ptr() }; iff.ifr_ifru.ifru_netmask = unsafe { *addr.as_ptr() };
self.perform(|fd| unsafe { sys::if_set_netmask(fd, &iff) })?; self.perform(|fd| unsafe { sys::if_set_netmask(fd, &iff) })?;
info!(
"netmask_set: {:?} (fd: {:?})",
unsafe { iff.ifr_ifru.ifru_netmask },
self.as_raw_fd()
)
} }
#[throws] #[throws]