aboutsummaryrefslogtreecommitdiffstats
path: root/src/wireguard/router
diff options
context:
space:
mode:
authorMathias Hall-Andersen <mathias@hall-andersen.dk>2019-12-16 15:26:15 +0100
committerMathias Hall-Andersen <mathias@hall-andersen.dk>2019-12-16 15:26:15 +0100
commitfd3ba63e80e7f97ae89ab5938fe6594c2d1c0869 (patch)
treeeb4d998b2e2b19440466c17a22d5742cd9ebdfc7 /src/wireguard/router
parentRemoved unused atexit (diff)
downloadwireguard-rs-fd3ba63e80e7f97ae89ab5938fe6594c2d1c0869.tar.xz
wireguard-rs-fd3ba63e80e7f97ae89ab5938fe6594c2d1c0869.zip
Revert to crossbeam
Diffstat (limited to '')
-rw-r--r--src/wireguard/router/inbound.rs2
-rw-r--r--src/wireguard/router/outbound.rs2
-rw-r--r--src/wireguard/router/pool.rs7
-rw-r--r--src/wireguard/router/workers.rs5
4 files changed, 7 insertions, 9 deletions
diff --git a/src/wireguard/router/inbound.rs b/src/wireguard/router/inbound.rs
index db6d3f3..96c2e33 100644
--- a/src/wireguard/router/inbound.rs
+++ b/src/wireguard/router/inbound.rs
@@ -8,12 +8,12 @@ use super::runq::RunQueue;
use super::types::Callbacks;
use super::{tun, udp, Endpoint};
+use crossbeam_channel::Receiver;
use ring::aead::{Aad, LessSafeKey, Nonce, UnboundKey, CHACHA20_POLY1305};
use zerocopy::{AsBytes, LayoutVerified};
use std::mem;
use std::sync::atomic::Ordering;
-use std::sync::mpsc::Receiver;
use std::sync::Arc;
pub const SIZE_TAG: usize = 16;
diff --git a/src/wireguard/router/outbound.rs b/src/wireguard/router/outbound.rs
index a555ecb..a0a1c72 100644
--- a/src/wireguard/router/outbound.rs
+++ b/src/wireguard/router/outbound.rs
@@ -8,9 +8,9 @@ use super::KeyPair;
use super::REJECT_AFTER_MESSAGES;
use super::{tun, udp, Endpoint};
-use std::sync::mpsc::Receiver;
use std::sync::Arc;
+use crossbeam_channel::Receiver;
use ring::aead::{Aad, LessSafeKey, Nonce, UnboundKey, CHACHA20_POLY1305};
use zerocopy::{AsBytes, LayoutVerified};
diff --git a/src/wireguard/router/pool.rs b/src/wireguard/router/pool.rs
index 686c788..3fc0026 100644
--- a/src/wireguard/router/pool.rs
+++ b/src/wireguard/router/pool.rs
@@ -1,9 +1,10 @@
-use arraydeque::ArrayDeque;
-use spin::{Mutex, MutexGuard};
use std::mem;
-use std::sync::mpsc::Receiver;
use std::sync::Arc;
+use arraydeque::ArrayDeque;
+use crossbeam_channel::Receiver;
+use spin::{Mutex, MutexGuard};
+
use super::constants::INORDER_QUEUE_SIZE;
use super::runq::{RunQueue, ToKey};
diff --git a/src/wireguard/router/workers.rs b/src/wireguard/router/workers.rs
index 3ed6311..43464a0 100644
--- a/src/wireguard/router/workers.rs
+++ b/src/wireguard/router/workers.rs
@@ -1,13 +1,10 @@
-use std::sync::mpsc::Receiver;
use std::sync::Arc;
-use futures::sync::oneshot;
-use futures::*;
-
use log::{debug, trace};
use ring::aead::{Aad, LessSafeKey, Nonce, UnboundKey, CHACHA20_POLY1305};
+use crossbeam_channel::Receiver;
use std::sync::atomic::Ordering;
use zerocopy::{AsBytes, LayoutVerified};