From 5a7f762d6ce6b5bbdbd10f5966adc909597f37d6 Mon Sep 17 00:00:00 2001 From: Mathias Hall-Andersen Date: Tue, 3 Dec 2019 21:49:08 +0100 Subject: Moving away from peer threads --- src/platform/dummy/tun.rs | 2 -- src/platform/linux/tun.rs | 24 +----------------------- 2 files changed, 1 insertion(+), 25 deletions(-) (limited to 'src/platform') diff --git a/src/platform/dummy/tun.rs b/src/platform/dummy/tun.rs index 5d13628..50c6654 100644 --- a/src/platform/dummy/tun.rs +++ b/src/platform/dummy/tun.rs @@ -6,9 +6,7 @@ use rand::Rng; use std::cmp::min; use std::error::Error; use std::fmt; -use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::mpsc::{sync_channel, Receiver, SyncSender}; -use std::sync::Arc; use std::sync::Mutex; use std::thread; use std::time::Duration; diff --git a/src/platform/linux/tun.rs b/src/platform/linux/tun.rs index 2bac49f..39b9320 100644 --- a/src/platform/linux/tun.rs +++ b/src/platform/linux/tun.rs @@ -359,31 +359,9 @@ impl PlatformTun for LinuxTun { // create PlatformTunMTU instance Ok(( - vec![LinuxTunReader { fd }], // TODO: enable multi-queue for Linux + vec![LinuxTunReader { fd }], // TODO: use multi-queue for Linux LinuxTunWriter { fd }, LinuxTunStatus::new(req.name)?, )) } } - -#[cfg(test)] -mod tests { - use super::*; - use std::env; - - fn is_root() -> bool { - match env::var("USER") { - Ok(val) => val == "root", - Err(_) => false, - } - } - - #[test] - fn test_tun_create() { - if !is_root() { - return; - } - let (readers, writers, mtu) = LinuxTun::create("test").unwrap(); - // TODO: test (any good idea how?) - } -} -- cgit v1.2.3-59-g8ed1b