From d4f5d5b7237d78ea177004a0650a550d03110b7c Mon Sep 17 00:00:00 2001 From: Mathias Hall-Andersen Date: Fri, 27 Dec 2019 18:01:11 +0100 Subject: Fixed typo in under load code --- src/wireguard/peer.rs | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'src/wireguard/peer.rs') diff --git a/src/wireguard/peer.rs b/src/wireguard/peer.rs index e02d2e0..1af4df3 100644 --- a/src/wireguard/peer.rs +++ b/src/wireguard/peer.rs @@ -4,8 +4,8 @@ use super::timers::{Events, Timers}; use super::tun::Tun; use super::udp::UDP; -use super::wireguard::WireGuard; use super::constants::REKEY_TIMEOUT; +use super::wireguard::WireGuard; use super::workers::HandshakeJob; use std::fmt; @@ -60,21 +60,31 @@ impl PeerInner { * The function is ratelimited. */ pub fn packet_send_handshake_initiation(&self) { - // the function is rate limited + log::trace!("{} : packet_send_handshake_initiation", self); + // the function is rate limited { let mut lhs = self.last_handshake_sent.lock(); if lhs.elapsed() < REKEY_TIMEOUT { + log::trace!("{} : packet_send_handshake_initiation, rate-limited!", self); return; } *lhs = Instant::now(); } // create a new handshake job for the peer - if !self.handshake_queued.swap(true, Ordering::SeqCst) { self.wg.pending.fetch_add(1, Ordering::SeqCst); self.wg.queue.send(HandshakeJob::New(self.pk)); + log::trace!( + "{} : packet_send_handshake_initiation, handshake queued", + self + ); + } else { + log::trace!( + "{} : packet_send_handshake_initiation, handshake already queued", + self + ); } } @@ -89,6 +99,12 @@ impl PeerInner { } } +impl fmt::Display for PeerInner { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + write!(f, "peer(id = {})", self.id) + } +} + impl fmt::Display for Peer { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { write!(f, "peer(id = {})", self.id) -- cgit v1.2.3-11-g984f