summaryrefslogtreecommitdiffhomepage
path: root/device
diff options
context:
space:
mode:
authorMatt Layher <mdlayher@gmail.com>2019-06-03 15:46:46 -0400
committerJason A. Donenfeld <Jason@zx2c4.com>2019-06-03 22:15:41 +0200
commit18b6627f33883e28dd69b2990c52359002856694 (patch)
treefc1f4ba5ac62252eddfab68de391dcf89d1edce7 /device
parent80ef2a42e66a9cb57f806ca49361b9e2a5e6c45f (diff)
device, ratelimiter: replace uses of time.Now().Sub() with time.Since()
Simplification found by staticcheck: $ staticcheck ./... | grep S1012 device/cookie.go:90:5: should use time.Since instead of time.Now().Sub (S1012) device/cookie.go:127:5: should use time.Since instead of time.Now().Sub (S1012) device/cookie.go:242:5: should use time.Since instead of time.Now().Sub (S1012) device/noise-protocol.go:304:13: should use time.Since instead of time.Now().Sub (S1012) device/receive.go:82:46: should use time.Since instead of time.Now().Sub (S1012) device/send.go:132:5: should use time.Since instead of time.Now().Sub (S1012) device/send.go:139:5: should use time.Since instead of time.Now().Sub (S1012) device/send.go:235:59: should use time.Since instead of time.Now().Sub (S1012) device/send.go:393:9: should use time.Since instead of time.Now().Sub (S1012) ratelimiter/ratelimiter.go:79:10: should use time.Since instead of time.Now().Sub (S1012) ratelimiter/ratelimiter.go:87:10: should use time.Since instead of time.Now().Sub (S1012) Change applied using: $ find . -type f -name "*.go" -exec sed -i "s/Now().Sub(/Since(/g" {} \; Signed-off-by: Matt Layher <mdlayher@gmail.com>
Diffstat (limited to 'device')
-rw-r--r--device/cookie.go6
-rw-r--r--device/noise-protocol.go2
-rw-r--r--device/receive.go2
-rw-r--r--device/send.go8
4 files changed, 9 insertions, 9 deletions
diff --git a/device/cookie.go b/device/cookie.go
index 3a88a0c..f134128 100644
--- a/device/cookie.go
+++ b/device/cookie.go
@@ -87,7 +87,7 @@ func (st *CookieChecker) CheckMAC2(msg []byte, src []byte) bool {
st.RLock()
defer st.RUnlock()
- if time.Now().Sub(st.mac2.secretSet) > CookieRefreshTime {
+ if time.Since(st.mac2.secretSet) > CookieRefreshTime {
return false
}
@@ -124,7 +124,7 @@ func (st *CookieChecker) CreateReply(
// refresh cookie secret
- if time.Now().Sub(st.mac2.secretSet) > CookieRefreshTime {
+ if time.Since(st.mac2.secretSet) > CookieRefreshTime {
st.RUnlock()
st.Lock()
_, err := rand.Read(st.mac2.secret[:])
@@ -239,7 +239,7 @@ func (st *CookieGenerator) AddMacs(msg []byte) {
// set mac2
- if time.Now().Sub(st.mac2.cookieSet) > CookieRefreshTime {
+ if time.Since(st.mac2.cookieSet) > CookieRefreshTime {
return
}
diff --git a/device/noise-protocol.go b/device/noise-protocol.go
index 1f70e81..dd75cc3 100644
--- a/device/noise-protocol.go
+++ b/device/noise-protocol.go
@@ -301,7 +301,7 @@ func (device *Device) ConsumeMessageInitiation(msg *MessageInitiation) *Peer {
var ok bool
ok = timestamp.After(handshake.lastTimestamp)
- ok = ok && time.Now().Sub(handshake.lastInitiationConsumption) > HandshakeInitationRate
+ ok = ok && time.Since(handshake.lastInitiationConsumption) > HandshakeInitationRate
handshake.mutex.RUnlock()
if !ok {
return nil
diff --git a/device/receive.go b/device/receive.go
index 22870f2..32d632b 100644
--- a/device/receive.go
+++ b/device/receive.go
@@ -79,7 +79,7 @@ func (peer *Peer) keepKeyFreshReceiving() {
return
}
keypair := peer.keypairs.Current()
- if keypair != nil && keypair.isInitiator && time.Now().Sub(keypair.created) > (RejectAfterTime-KeepaliveTimeout-RekeyTimeout) {
+ if keypair != nil && keypair.isInitiator && time.Since(keypair.created) > (RejectAfterTime-KeepaliveTimeout-RekeyTimeout) {
peer.timers.sentLastMinuteHandshake.Set(true)
peer.SendHandshakeInitiation(false)
}
diff --git a/device/send.go b/device/send.go
index ae96aa2..2198427 100644
--- a/device/send.go
+++ b/device/send.go
@@ -129,14 +129,14 @@ func (peer *Peer) SendHandshakeInitiation(isRetry bool) error {
}
peer.handshake.mutex.RLock()
- if time.Now().Sub(peer.handshake.lastSentHandshake) < RekeyTimeout {
+ if time.Since(peer.handshake.lastSentHandshake) < RekeyTimeout {
peer.handshake.mutex.RUnlock()
return nil
}
peer.handshake.mutex.RUnlock()
peer.handshake.mutex.Lock()
- if time.Now().Sub(peer.handshake.lastSentHandshake) < RekeyTimeout {
+ if time.Since(peer.handshake.lastSentHandshake) < RekeyTimeout {
peer.handshake.mutex.Unlock()
return nil
}
@@ -232,7 +232,7 @@ func (peer *Peer) keepKeyFreshSending() {
return
}
nonce := atomic.LoadUint64(&keypair.sendNonce)
- if nonce > RekeyAfterMessages || (keypair.isInitiator && time.Now().Sub(keypair.created) > RekeyAfterTime) {
+ if nonce > RekeyAfterMessages || (keypair.isInitiator && time.Since(keypair.created) > RekeyAfterTime) {
peer.SendHandshakeInitiation(false)
}
}
@@ -390,7 +390,7 @@ func (peer *Peer) RoutineNonce() {
keypair = peer.keypairs.Current()
if keypair != nil && keypair.sendNonce < RejectAfterMessages {
- if time.Now().Sub(keypair.created) < RejectAfterTime {
+ if time.Since(keypair.created) < RejectAfterTime {
break
}
}