diff options
| author |   Mathias Hall-Andersen <mathias@hall-andersen.dk> | 2019-10-23 14:14:08 +0200 |
|---|---|---|
| committer | Mathias Hall-Andersen <mathias@hall-andersen.dk> | 2019-10-23 14:14:08 +0200 |
| commit | 3e829c04d1edfde1966a0d3f7f330fadd7ca9cd8 (patch) | |
| tree | 5e749f39590eeedf56430c6cacf0a16af0fb2550 /src/wireguard | |
| parent | Work on pure WireGuard test (diff) | |
| download | wireguard-rs-3e829c04d1edfde1966a0d3f7f330fadd7ca9cd8.tar.xz wireguard-rs-3e829c04d1edfde1966a0d3f7f330fadd7ca9cd8.zip | |
Fixed Ordering::Acquire -> Ordering::SeqCst typo
Diffstat (limited to 'src/wireguard')
| -rw-r--r-- | src/wireguard/tests.rs | 2 | ||||
| -rw-r--r-- | src/wireguard/timers.rs | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/wireguard/tests.rs b/src/wireguard/tests.rs index 0dc9296..7c87056 100644 --- a/src/wireguard/tests.rs +++ b/src/wireguard/tests.rs @@ -109,4 +109,6 @@ fn test_pure_wireguard() { "192.168.2.20".parse().unwrap(), // src "192.168.1.10".parse().unwrap(), // dst ); + + fake1.write(packet_p1_to_p2); } diff --git a/src/wireguard/timers.rs b/src/wireguard/timers.rs index 40717f8..5ebc746 100644 --- a/src/wireguard/timers.rs +++ b/src/wireguard/timers.rs @@ -100,7 +100,7 @@ impl <B: bind::Bind>PeerInner<B> { */ pub fn sent_handshake_initiation(&self) { *self.last_handshake.lock() = SystemTime::now(); - self.handshake_queued.store(false, Ordering::Acquire); + self.handshake_queued.store(false, Ordering::SeqCst); self.timers_any_authenticated_packet_traversal(); self.timers_any_authenticated_packet_sent(); } @@ -150,8 +150,8 @@ impl Timers { let peer = peer.clone(); runner.timer(move || { info!( - "Retrying handshake with {}, because we stopped hearing back after {} seconds", - peer, + "Retrying handshake with {}, because we stopped hearing back after {} seconds", + peer, (KEEPALIVE_TIMEOUT + REKEY_TIMEOUT).as_secs() ); peer.new_handshake(); @@ -256,7 +256,7 @@ impl<T: tun::Tun, B: bind::Bind> Callbacks for Events<T, B> { /* Called every time the router detects that a key is required, * but no valid key-material is available for the particular peer. - * + * * The message is called continuously * (e.g. for every packet that must be encrypted, until a key becomes available) */ |