From aabefa50436af8d614520bb219d675953eeba6eb Mon Sep 17 00:00:00 2001 From: Mathias Hall-Andersen Date: Sat, 21 Dec 2019 00:17:31 +0100 Subject: Remove unused test code. - make naming consistent with the kernel module. - better distribution of functionality from src/wireguard.rs - more consistent "import pattern" throughout the project. - remove unused test code. --- src/platform/dummy/bind.rs | 224 --------------------------------------------- 1 file changed, 224 deletions(-) delete mode 100644 src/platform/dummy/bind.rs (limited to 'src/platform/dummy/bind.rs') diff --git a/src/platform/dummy/bind.rs b/src/platform/dummy/bind.rs deleted file mode 100644 index 3146af8..0000000 --- a/src/platform/dummy/bind.rs +++ /dev/null @@ -1,224 +0,0 @@ -use hex; -use std::error::Error; -use std::fmt; -use std::marker; - -use log::debug; -use rand::rngs::OsRng; -use rand::Rng; - -use std::sync::mpsc::{sync_channel, Receiver, SyncSender}; -use std::sync::Arc; -use std::sync::Mutex; - -use super::super::udp::*; - -use super::UnitEndpoint; - -pub struct VoidOwner {} - -#[derive(Debug)] -pub enum BindError { - Disconnected, -} - -impl Error for BindError { - fn description(&self) -> &str { - "Generic Bind Error" - } - - fn source(&self) -> Option<&(dyn Error + 'static)> { - None - } -} - -impl fmt::Display for BindError { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - match self { - BindError::Disconnected => write!(f, "PairBind disconnected"), - } - } -} - -/* TUN implementation */ - -#[derive(Debug)] -pub enum TunError { - Disconnected, -} - -impl Error for TunError { - fn description(&self) -> &str { - "Generic Tun Error" - } - - fn source(&self) -> Option<&(dyn Error + 'static)> { - None - } -} - -impl fmt::Display for TunError { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - write!(f, "Not Possible") - } -} - -#[derive(Clone, Copy)] -pub struct VoidBind {} - -impl Reader for VoidBind { - type Error = BindError; - - fn read(&self, _buf: &mut [u8]) -> Result<(usize, UnitEndpoint), Self::Error> { - Ok((0, UnitEndpoint {})) - } -} - -impl Writer for VoidBind { - type Error = BindError; - - fn write(&self, _buf: &[u8], _dst: &UnitEndpoint) -> Result<(), Self::Error> { - Ok(()) - } -} - -impl UDP for VoidBind { - type Error = BindError; - type Endpoint = UnitEndpoint; - - type Reader = VoidBind; - type Writer = VoidBind; -} - -impl VoidBind { - pub fn new() -> VoidBind { - VoidBind {} - } -} - -/* Pair Bind */ - -#[derive(Clone)] -pub struct PairReader { - id: u32, - recv: Arc>>>, - _marker: marker::PhantomData, -} - -impl Reader for PairReader { - type Error = BindError; - fn read(&self, buf: &mut [u8]) -> Result<(usize, UnitEndpoint), Self::Error> { - let vec = self - .recv - .lock() - .unwrap() - .recv() - .map_err(|_| BindError::Disconnected)?; - let len = vec.len(); - buf[..len].copy_from_slice(&vec[..]); - debug!( - "dummy({}): read ({}, {})", - self.id, - len, - hex::encode(&buf[..len]) - ); - Ok((len, UnitEndpoint {})) - } -} - -impl Writer for PairWriter { - type Error = BindError; - fn write(&self, buf: &[u8], _dst: &UnitEndpoint) -> Result<(), Self::Error> { - debug!( - "dummy({}): write ({}, {})", - self.id, - buf.len(), - hex::encode(buf) - ); - let owned = buf.to_owned(); - match self.send.lock().unwrap().send(owned) { - Err(_) => Err(BindError::Disconnected), - Ok(_) => Ok(()), - } - } -} - -#[derive(Clone)] -pub struct PairWriter { - id: u32, - send: Arc>>>, - _marker: marker::PhantomData, -} - -#[derive(Clone)] -pub struct PairBind {} - -impl PairBind { - pub fn pair() -> ( - (PairReader, PairWriter), - (PairReader, PairWriter), - ) { - let mut rng = OsRng::new().unwrap(); - let id1: u32 = rng.gen(); - let id2: u32 = rng.gen(); - - let (tx1, rx1) = sync_channel(128); - let (tx2, rx2) = sync_channel(128); - ( - ( - PairReader { - id: id1, - recv: Arc::new(Mutex::new(rx1)), - _marker: marker::PhantomData, - }, - PairWriter { - id: id1, - send: Arc::new(Mutex::new(tx2)), - _marker: marker::PhantomData, - }, - ), - ( - PairReader { - id: id2, - recv: Arc::new(Mutex::new(rx2)), - _marker: marker::PhantomData, - }, - PairWriter { - id: id2, - send: Arc::new(Mutex::new(tx1)), - _marker: marker::PhantomData, - }, - ), - ) - } -} - -impl UDP for PairBind { - type Error = BindError; - type Endpoint = UnitEndpoint; - type Reader = PairReader; - type Writer = PairWriter; -} - -impl Owner for VoidOwner { - type Error = BindError; - - fn set_fwmark(&mut self, _value: Option) -> Result<(), Self::Error> { - Ok(()) - } - - fn get_port(&self) -> u16 { - 0 - } - - fn get_fwmark(&self) -> Option { - None - } -} - -impl PlatformUDP for PairBind { - type Owner = VoidOwner; - fn bind(_port: u16) -> Result<(Vec, Self::Writer, Self::Owner), Self::Error> { - Err(BindError::Disconnected) - } -} -- cgit v1.2.3-59-g8ed1b