wip

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

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 }
-    }
-
-    #[throws]
-    pub fn name(&self) -> String {
-        let mut iff = unsafe { mem::zeroed() };
-        unsafe { sys::tun_get_iff(self.socket.as_raw_fd(), &mut iff)? };
-        ifname_to_string(iff.ifr_name)
-    }
-
-    #[throws]
-    fn ifreq(&self) -> sys::ifreq {
-        let mut iff: sys::ifreq = unsafe { mem::zeroed() };
-        iff.ifr_name = string_to_ifname(&self.name()?);
-        iff
-    }
-
-    #[throws]
-    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]
-    pub fn set_ipv4_addr(&self, addr: Ipv4Addr) {
-        let addr = SockAddr::from(SocketAddrV4::new(addr, 0));
-
-        let mut iff = self.ifreq()?;
-        iff.ifr_ifru.ifru_addr = unsafe { *addr.as_ptr() };
-
-        self.perform(|fd| unsafe { sys::if_set_addr(fd, &iff) })?;
-    }
-
-    #[throws]
-    pub fn ipv4_addr(&self) -> Ipv4Addr {
-        let mut iff = self.ifreq()?;
-        self.perform(|fd| unsafe { sys::if_get_addr(fd, &mut iff) })?;
-
-        let addr = unsafe { &*(&iff.ifr_ifru.ifru_addr as *const _ as *const sys::sockaddr_in) };
-
-        Ipv4Addr::from(addr.sin_addr.s_addr)
-    }
-
-    #[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())?
+        PlatformTun { socket }
+    }
+}
+
+impl TunInterface for PlatformTun {
+    #[throws]
+    fn get_interface_name(&self) -> String {
+        unsafe {
+            let mut iff = mem::zeroed();
+            sys::tun_get_iff(self.socket.as_raw_fd(), &mut iff)?;
+            ifname_to_string(iff.ifr_name)
+        }
+    }
+
+    #[throws]
+    fn set_ip(&self, addr: IpAddr) {
+        match addr {
+            IpAddr::V4(addr) => self.set_ipv4(addr)?,
+            _ => (),
+        }
+    }
+
+    #[throws]
+    fn set_ipv4(&self, addr: Ipv4Addr) {
+        let socket = Socket::new(Domain::IPV4, Type::DGRAM, None)?;
+        let addr = SockAddr::from(SocketAddrV4::new(addr, 0));
+        unsafe {
+            let mut iff: libc::ifreq = mem::zeroed();
+            iff.ifr_name = string_to_ifname(&self.get_interface_name()?);
+            iff.ifr_ifru.ifru_addr = *addr.as_ptr();
+            sys::if_set_addr(socket.as_raw_fd(), &iff)?;
+        }
+    }
+
+    #[throws]
+    fn get_ip(&self) -> IpAddr {
+        let addr = self.socket.local_addr()?;
+        addr.as_socket().unwrap().ip()
+    }
+
+    fn into_raw_socket(self) -> socket2::Socket {
+        self.socket
     }
 }