device: recheck counters while holding write lock

diff --git a/device/noise-protocol.go b/device/noise-protocol.go
index dd75cc3b5571dcfc66838ad57eca8e6749992842..88c6aae174f2ff3677c6580930a5f5ba1d7fb734 100644 (file)
--- a/device/noise-protocol.go
+++ b/device/noise-protocol.go
@@ -315,8 +315,13 @@ func (device *Device) ConsumeMessageInitiation(msg *MessageInitiation) *Peer {
        handshake.chainKey = chainKey
        handshake.remoteIndex = msg.Sender
        handshake.remoteEphemeral = msg.Ephemeral
-       handshake.lastTimestamp = timestamp
-       handshake.lastInitiationConsumption = time.Now()
+       if timestamp.After(handshake.lastTimestamp) {
+               handshake.lastTimestamp = timestamp
+       }
+       now := time.Now()
+       if now.After(handshake.lastInitiationConsumption) {
+               handshake.lastInitiationConsumption = now
+       }
        handshake.state = HandshakeInitiationConsumed
 
        handshake.mutex.Unlock()