evan/protomask
1
Fork 0
Code

Implement Clippy recommendations

Browse Source
This commit is contained in:
Evan Pratten 2024-04-24 11:31:07 -04:00
parent 33e3dae0ab
commit 113f08d1d2
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/easy-tun/examples/print_traffic.rs
View File

@ -7,7 +7,7 @@ fn main() {
env_logger::init(); env_logger::init();
// Bring up a TUN interface // Bring up a TUN interface
let mut tun = Tun::new("tun%d", 1).unwrap(); let tun = Tun::new("tun%d", 1).unwrap();
// Loop and read from the interface // Loop and read from the interface
let mut buffer = [0u8; 1500]; let mut buffer = [0u8; 1500];

14
libs/easy-tun/src/tun.rs
View File

@ -1,8 +1,7 @@
use std::{ use std::{
fs::{File, OpenOptions}, fs::{File, OpenOptions},
io::{Read, Write},
mem::size_of, mem::size_of,
os::fd::{AsRawFd, IntoRawFd, RawFd}, os::fd::AsRawFd,
}; };
use ioctl_gen::{ioc, iow}; use ioctl_gen::{ioc, iow};
@ -25,7 +24,7 @@ mod arch {
/// A TUN device /// A TUN device
pub struct Tun { pub struct Tun {
/// All internal file descriptors /// All internal file descriptors
fds: Vec<Box<File>>, fds: Vec<File>,
/// Device name /// Device name
name: String, name: String,
} }
@ -52,7 +51,7 @@ impl Tun {
.read(true) .read(true)
.write(true) .write(true)
.open("/dev/net/tun")?; .open("/dev/net/tun")?;
fds.push(Box::new(fd)); fds.push(fd);
} }
// Copy the device name into a C string with padding // Copy the device name into a C string with padding
@ -72,7 +71,7 @@ impl Tun {
}; };
// Each FD needs to be configured separately // Each FD needs to be configured separately
for fd in fds.iter_mut() { for fd in &mut fds {
// Make an ioctl call to create the TUN device // Make an ioctl call to create the TUN device
log::trace!("Calling ioctl to create TUN device"); log::trace!("Calling ioctl to create TUN device");
let err = unsafe { let err = unsafe {
@ -113,13 +112,12 @@ impl Tun {
/// Get the underlying file descriptor /// Get the underlying file descriptor
#[must_use] #[must_use]
pub fn fd(&self, queue_id: usize) -> Option<&File> { pub fn fd(&self, queue_id: usize) -> Option<&File> {
self.fds.get(queue_id).map(|fd| &**fd) self.fds.get(queue_id)
} }
/// Get mutable access to the underlying file descriptor /// Get mutable access to the underlying file descriptor
#[must_use] #[must_use]
pub fn fd_mut(&mut self, queue_id: usize) -> Option<&mut File> { pub fn fd_mut(&mut self, queue_id: usize) -> Option<&mut File> {
self.fds.get_mut(queue_id).map(|fd| &mut **fd) self.fds.get_mut(queue_id).map(|fd| &mut *fd)
} }
} }