Add Read and Write for Async TunInterface

Those features are implemented using AsyncFD. While write doesn't
require a mutable reference to self, read does.

Make Async Tun a feature

remove async tun from workspace

rename write/read to send/recv
This commit is contained in:
JettChenT 2023-06-19 22:45:25 +08:00 committed by Conrad Kramer
parent d3882bd008
commit beae8c0f79
12 changed files with 135 additions and 64 deletions

View file

@ -2,13 +2,10 @@ use byteorder::{ByteOrder, NetworkEndian};
use fehler::throws;
use libc::{c_char, iovec, writev, AF_INET, AF_INET6};
use socket2::{Domain, SockAddr, Socket, Type};
use std::io::{IoSlice, Write};
use std::io::IoSlice;
use std::net::{Ipv4Addr, SocketAddrV4};
use std::os::fd::{AsRawFd, RawFd};
use std::{
io::{Error},
mem,
};
use std::{io::Error, mem};
mod kern_control;
mod sys;
@ -130,11 +127,9 @@ impl TunInterface {
self.perform(|fd| unsafe { sys::if_set_netmask(fd, &iff) })?;
}
}
impl Write for TunInterface {
#[throws]
fn write(&mut self, buf: &[u8]) -> usize {
pub fn send(&self, buf: &[u8]) -> usize {
use std::io::ErrorKind;
let proto = match buf[0] >> 4 {
6 => Ok(AF_INET6),
@ -156,10 +151,6 @@ impl Write for TunInterface {
.try_into()
.map_err(|_| Error::new(ErrorKind::Other, "Conversion error"))?
}
fn flush(&mut self) -> std::io::Result<()> {
Ok(())
}
}
#[cfg(test)]