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

Add Read and Write for Async TunInterface

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

14
tun/src/unix/mod.rs
View file

@ -40,13 +40,8 @@ impl IntoRawFd for TunInterface {
}
impl TunInterface {
// #[throws]
// pub fn write(&self, buf: &[u8]) -> usize {
// self.socket.send(buf)?
// }
#[throws]
pub fn read(&mut self, buf: &mut [u8]) -> usize {
pub fn recv(&mut self, buf: &mut [u8]) -> usize {
self.socket.read(buf)?
}
}
@ -72,7 +67,6 @@ pub fn string_to_ifname(name: &str) -> [libc::c_char; libc::IFNAMSIZ] {
mod test {
use super::*;
use std::io::Write;
use std::net::Ipv4Addr;
@ -88,7 +82,7 @@ mod test {
println!("tun ip: {:?}", tun.ipv4_addr()?);
println!("Waiting for a packet...");
let buf = &mut [0u8; 1500];
let res = tun.read(buf);
let res = tun.recv(buf);
println!("Received!");
assert!(res.is_ok());
}
@ -96,10 +90,10 @@ mod test {
#[test]
#[throws]
fn write_packets() {
let mut tun = TunInterface::new()?;
let tun = TunInterface::new()?;
let mut buf = [0u8; 1500];
buf[0] = 6 << 4;
let bytes_written = tun.write(&buf)?;
let bytes_written = tun.send(&buf)?;
assert_eq!(bytes_written, 1504);
}
}