From eb6728400ba656990aa4518dc4f5f2a6f0f19f8e Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 18 Apr 2018 07:24:33 +0200 Subject: Use simple 16-bit integer for persistent keepalive Races for this aren't a huge problem. --- timers.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'timers.go') diff --git a/timers.go b/timers.go index 76dffb9..e118c38 100644 --- a/timers.go +++ b/timers.go @@ -105,7 +105,7 @@ func (peer *Peer) TimerAnyAuthenticatedPacketReceived() { * Push persistent keep-alive into the future */ func (peer *Peer) TimerAnyAuthenticatedPacketTraversal() { - interval := atomic.LoadUint64(&peer.persistentKeepaliveInterval) + interval := peer.persistentKeepaliveInterval if interval > 0 { duration := time.Duration(interval) * time.Second peer.timer.keepalivePersistent.Reset(duration) @@ -199,7 +199,7 @@ func (peer *Peer) RoutineTimerHandler() { peer.timer.handshakeNew.Stop() peer.timer.zeroAllKeys.Stop() - interval := atomic.LoadUint64(&peer.persistentKeepaliveInterval) + interval := peer.persistentKeepaliveInterval if interval > 0 { duration := time.Duration(interval) * time.Second peer.timer.keepalivePersistent.Reset(duration) @@ -225,7 +225,7 @@ func (peer *Peer) RoutineTimerHandler() { case <-peer.timer.keepalivePersistent.Wait(): - interval := atomic.LoadUint64(&peer.persistentKeepaliveInterval) + interval := peer.persistentKeepaliveInterval if interval > 0 { logDebug.Println(peer.String(), ": Send keep-alive (persistent)") peer.timer.keepalivePassive.Stop() -- cgit v1.2.3