diff options
author | Mathias Hall-Andersen <mathias@hall-andersen.dk> | 2020-02-12 21:38:25 +0100 |
---|---|---|
committer | Mathias Hall-Andersen <mathias@hall-andersen.dk> | 2020-02-12 21:38:25 +0100 |
commit | 5e6edb280e588397c3420d08cf46a52b34b58740 (patch) | |
tree | dee5854adb5adce3549e53d96b48f0ef16886f04 /src/wireguard/wireguard.rs | |
parent | Squashed commit of the following: (diff) | |
download | wireguard-rs-5e6edb280e588397c3420d08cf46a52b34b58740.tar.xz wireguard-rs-5e6edb280e588397c3420d08cf46a52b34b58740.zip |
Bumped crate versions.
Diffstat (limited to '')
-rw-r--r-- | src/wireguard/wireguard.rs | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/wireguard/wireguard.rs b/src/wireguard/wireguard.rs index ecbb9c1..b878adc 100644 --- a/src/wireguard/wireguard.rs +++ b/src/wireguard/wireguard.rs @@ -44,9 +44,6 @@ pub struct WireguardInner<T: Tun, B: UDP> { // current MTU pub mtu: AtomicUsize, - // outbound writer - pub send: RwLock<Option<B::Writer>>, - // peer map pub peers: RwLock<handshake::Device<Peer<T, B>>>, @@ -134,7 +131,7 @@ impl<T: Tun, B: UDP> WireGuard<T, B> { // set mtu self.mtu.store(0, Ordering::Relaxed); - // avoid tranmission from router + // avoid transmission from router self.router.down(); // set all peers down (stops timers) @@ -264,8 +261,6 @@ impl<T: Tun, B: UDP> WireGuard<T, B> { } pub fn set_writer(&self, writer: B::Writer) { - // TODO: Consider unifying these and avoid Clone requirement on writer - *self.send.write() = Some(writer.clone()); self.router.set_outbound_writer(writer); } @@ -301,8 +296,7 @@ impl<T: Tun, B: UDP> WireGuard<T, B> { id: OsRng.gen(), mtu: AtomicUsize::new(0), last_under_load: Mutex::new(Instant::now() - TIME_HORIZON), - send: RwLock::new(None), - router: router::Device::new(num_cpus::get(), writer), // router owns the writing half + router: router::Device::new(num_cpus::get(), writer), pending: AtomicUsize::new(0), peers: RwLock::new(handshake::Device::new()), runner: Mutex::new(Runner::new(TIMERS_TICK, TIMERS_SLOTS, TIMERS_CAPACITY)), |