wip

not sure what's not working, but initial work on the trait

burrow/src/main.rs

@@ -2,19 +2,17 @@ use std::{mem::MaybeUninit, net::Ipv4Addr};
 
 use tokio::io::Result;
 use tun::TunInterface;
-use tun_async::TunQueue;
+use tun::TunQueue;
 
 async fn try_main() -> Result<()> {
-    let iface = TunInterface::new()?;
+    let iface = tun::create_interface();
-    iface.set_ipv4_addr(Ipv4Addr::new(10, 0, 0, 2))?;
+    iface.set_ipv4(Ipv4Addr::new(10, 0, 0, 2))?;
-    println!("{:?}", iface.index()?);
-    println!("{:?}", iface.ipv4_addr()?);
 
-    let queue = TunQueue::from_queue(iface.into())?;
+    let queue = TunQueue::from(iface);
 
     loop {
         let mut buf = [MaybeUninit::<u8>::uninit(); 1500];
-        let len = queue.try_recv(&mut buf).await?;
+        let len = queue.recv(&mut buf)?;
         println!("Received {len} bytes");
     }
 }

tun/src/lib.rs

@@ -6,4 +6,37 @@ mod imp;
 #[path = "unix/mod.rs"]
 pub(crate) mod imp;
 
-pub use imp::{TunInterface, TunQueue};
+/**
+ * Standard platform-independent interface for a tunnel.
+ */
+pub trait TunInterface {
+    /**
+     * Sets the interface IP address. Accepts either IPv6 or IPv4
+     */
+    fn set_ip(&self, ip: IpAddr) -> Result<(), std::io::Error>;
+
+    /**
+     * Sets the interface IP address to an IPv4 address.
+     *
+     * Used by [set_ip](TunInterface::set_ip)
+     */
+    fn set_ipv4(&self, ip: Ipv4Addr) -> Result<(), std::io::Error>;
+
+    fn get_ip(&self) -> Result<IpAddr, std::io::Error>;
+
+    fn get_interface_name(&self) -> Result<String, std::io::Error>;
+
+    fn into_raw_socket(self) -> socket2::Socket;
+}
+
+#[cfg(target_os = "linux")]
+pub fn create_interface() -> impl TunInterface {
+    PlatformTun::new().unwrap()
+}
+
+use std::{
+    net::{IpAddr, Ipv4Addr},
+    sync::Mutex,
+};
+
+pub use imp::{PlatformTun, TunQueue};

tun/src/unix/linux/mod.rs

@@ -4,23 +4,35 @@ use socket2::{Domain, SockAddr, Socket, Type};
 use std::fs::OpenOptions;
 use std::io::Error;
 use std::mem;
-use std::net::{Ipv4Addr, SocketAddrV4};
+use std::net::{IpAddr, Ipv4Addr, SocketAddrV4};
 use std::os::fd::RawFd;
 use std::os::unix::io::{AsRawFd, FromRawFd, IntoRawFd};
-
+use std::ptr;
+use std::sync::{Arc, Mutex};
 
 use super::{ifname_to_string, string_to_ifname};
+use crate::TunInterface;
 
 mod sys;
 
 #[derive(Debug)]
-pub struct TunInterface {
+pub struct PlatformTun {
     pub(crate) socket: socket2::Socket,
 }
 
-impl TunInterface {
+impl PlatformTun {
     #[throws]
-    pub fn new() -> TunInterface {
+    pub fn index(&self) -> i32 {
+        let socket = Socket::new(Domain::IPV4, Type::DGRAM, None)?;
+        unsafe {
+            let mut iff: libc::ifreq = mem::zeroed();
+            iff.ifr_name = string_to_ifname(&self.get_interface_name()?);
+            sys::if_get_index(socket.as_raw_fd(), &mut iff)?;
+            iff.ifr_ifru.ifru_ifindex
+        }
+    }
+    #[throws]
+    pub(crate) fn new() -> PlatformTun {
         let file = OpenOptions::new()
             .read(true)
             .write(true)
@@ -35,53 +47,47 @@ impl TunInterface {
         unsafe { sys::tun_set_iff(file.as_raw_fd(), &iff)? };
 
         let socket = unsafe { socket2::Socket::from_raw_fd(file.into_raw_fd()) };
-        TunInterface { socket }
+        PlatformTun { socket }
-    }
+    }
-
+}
-    #[throws]
+
-    pub fn name(&self) -> String {
+impl TunInterface for PlatformTun {
-        let mut iff = unsafe { mem::zeroed() };
+    #[throws]
-        unsafe { sys::tun_get_iff(self.socket.as_raw_fd(), &mut iff)? };
+    fn get_interface_name(&self) -> String {
-        ifname_to_string(iff.ifr_name)
+        unsafe {
-    }
+            let mut iff = mem::zeroed();
-
+            sys::tun_get_iff(self.socket.as_raw_fd(), &mut iff)?;
-    #[throws]
+            ifname_to_string(iff.ifr_name)
-    fn ifreq(&self) -> sys::ifreq {
+        }
-        let mut iff: sys::ifreq = unsafe { mem::zeroed() };
+    }
-        iff.ifr_name = string_to_ifname(&self.name()?);
+
-        iff
+    #[throws]
-    }
+    fn set_ip(&self, addr: IpAddr) {
-
+        match addr {
-    #[throws]
+            IpAddr::V4(addr) => self.set_ipv4(addr)?,
-    pub fn index(&self) -> i32 {
+            _ => (),
-        let mut iff = self.ifreq()?;
+        }
-        self.perform(|fd| unsafe { sys::if_get_index(fd, &mut iff) })?;
+    }
-        unsafe { iff.ifr_ifru.ifru_ifindex }
+
-    }
+    #[throws]
-
+    fn set_ipv4(&self, addr: Ipv4Addr) {
-    #[throws]
+        let socket = Socket::new(Domain::IPV4, Type::DGRAM, None)?;
-    pub fn set_ipv4_addr(&self, addr: Ipv4Addr) {
+        let addr = SockAddr::from(SocketAddrV4::new(addr, 0));
-        let addr = SockAddr::from(SocketAddrV4::new(addr, 0));
+        unsafe {
-
+            let mut iff: libc::ifreq = mem::zeroed();
-        let mut iff = self.ifreq()?;
+            iff.ifr_name = string_to_ifname(&self.get_interface_name()?);
-        iff.ifr_ifru.ifru_addr = unsafe { *addr.as_ptr() };
+            iff.ifr_ifru.ifru_addr = *addr.as_ptr();
-
+            sys::if_set_addr(socket.as_raw_fd(), &iff)?;
-        self.perform(|fd| unsafe { sys::if_set_addr(fd, &iff) })?;
+        }
-    }
+    }
-
+
-    #[throws]
+    #[throws]
-    pub fn ipv4_addr(&self) -> Ipv4Addr {
+    fn get_ip(&self) -> IpAddr {
-        let mut iff = self.ifreq()?;
+        let addr = self.socket.local_addr()?;
-        self.perform(|fd| unsafe { sys::if_get_addr(fd, &mut iff) })?;
+        addr.as_socket().unwrap().ip()
-
+    }
-        let addr = unsafe { &*(&iff.ifr_ifru.ifru_addr as *const _ as *const sys::sockaddr_in) };
+
-
+    fn into_raw_socket(self) -> socket2::Socket {
-        Ipv4Addr::from(addr.sin_addr.s_addr)
+        self.socket
-    }
-
-    #[throws]
-    fn perform<R>(&self, perform: impl FnOnce(RawFd) -> Result<R, nix::Error>) -> R {
-        let socket = Socket::new(Domain::IPV4, Type::DGRAM, None)?;
-        perform(socket.as_raw_fd())?
     }
 }

tun/src/unix/mod.rs

@@ -8,11 +8,11 @@ mod imp;
 #[path = "linux/mod.rs"]
 mod imp;
 
-
+pub use crate::TunInterface;
-
+pub use imp::PlatformTun;
-pub use imp::TunInterface;
+use libc::IFNAMSIZ;
-
 pub use queue::TunQueue;
+use std::ffi::CString;
 
 pub fn ifname_to_string(buf: [libc::c_char; libc::IFNAMSIZ]) -> String {
     // TODO: Switch to `CStr::from_bytes_until_nul` when stabilized

tun/src/unix/queue.rs

@@ -38,10 +38,10 @@ impl Write for TunQueue {
     }
 }
 
-impl From<TunInterface> for TunQueue {
+impl TunQueue {
-    fn from(interface: TunInterface) -> TunQueue {
+    pub fn from<T: TunInterface>(interface: T) -> TunQueue {
         TunQueue {
-            socket: interface.socket,
+            socket: interface.into_raw_socket(),
         }
     }
 }
@@ -52,8 +52,10 @@ impl AsRawFd for TunQueue {
     }
 }
 
-impl IntoRawFd for TunQueue {
+//TODO: error[E0507]: cannot move out of `*self.socket` which is behind a mutable reference
-    fn into_raw_fd(self) -> RawFd {
+
-        self.socket.into_raw_fd()
+//impl IntoRawFd for TunQueue {
-    }
+//    fn into_raw_fd(self) -> RawFd {
-}
+//        self.socket.into_raw_fd()
+//    }
+//}