extern/EtherGuard-VPN
1
0
Fork 0
mirror of https://github.com/KusakabeShi/EtherGuard-VPN.git synced 2024-11-25 08:43:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

device, ratelimiter: replace uses of time.Now().Sub() with time.Since()

Browse Source 
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>
This commit is contained in:
Matt Layher 2019-06-03 15:46:46 -04:00 committed by Jason A. Donenfeld
parent 80ef2a42e6
commit 18b6627f33
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
device/cookie.go
View File

@ -87,7 +87,7 @@ func (st *CookieChecker) CheckMAC2(msg []byte, src []byte) bool {
st.RLock() st.RLock()
defer st.RUnlock() defer st.RUnlock()
if time.Now().Sub(st.mac2.secretSet) > CookieRefreshTime { if time.Since(st.mac2.secretSet) > CookieRefreshTime {
return false return false
} }
@ -124,7 +124,7 @@ func (st *CookieChecker) CreateReply(
// refresh cookie secret // refresh cookie secret
if time.Now().Sub(st.mac2.secretSet) > CookieRefreshTime { if time.Since(st.mac2.secretSet) > CookieRefreshTime {
st.RUnlock() st.RUnlock()
st.Lock() st.Lock()
_, err := rand.Read(st.mac2.secret[:]) _, err := rand.Read(st.mac2.secret[:])
@ -239,7 +239,7 @@ func (st *CookieGenerator) AddMacs(msg []byte) {
// set mac2 // set mac2
if time.Now().Sub(st.mac2.cookieSet) > CookieRefreshTime { if time.Since(st.mac2.cookieSet) > CookieRefreshTime {
return return
} }

2
device/noise-protocol.go
View File

@ -301,7 +301,7 @@ func (device *Device) ConsumeMessageInitiation(msg *MessageInitiation) *Peer {
var ok bool var ok bool
ok = timestamp.After(handshake.lastTimestamp) ok = timestamp.After(handshake.lastTimestamp)
ok = ok && time.Now().Sub(handshake.lastInitiationConsumption) > HandshakeInitationRate ok = ok && time.Since(handshake.lastInitiationConsumption) > HandshakeInitationRate
handshake.mutex.RUnlock() handshake.mutex.RUnlock()
if !ok { if !ok {
return nil return nil

2
device/receive.go
View File

@ -79,7 +79,7 @@ func (peer *Peer) keepKeyFreshReceiving() {
return return
} }
keypair := peer.keypairs.Current() 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.timers.sentLastMinuteHandshake.Set(true)
peer.SendHandshakeInitiation(false) peer.SendHandshakeInitiation(false)
} }

8
device/send.go
View File

@ -129,14 +129,14 @@ func (peer *Peer) SendHandshakeInitiation(isRetry bool) error {
} }
peer.handshake.mutex.RLock() peer.handshake.mutex.RLock()
if time.Now().Sub(peer.handshake.lastSentHandshake) < RekeyTimeout { if time.Since(peer.handshake.lastSentHandshake) < RekeyTimeout {
peer.handshake.mutex.RUnlock() peer.handshake.mutex.RUnlock()
return nil return nil
} }
peer.handshake.mutex.RUnlock() peer.handshake.mutex.RUnlock()
peer.handshake.mutex.Lock() peer.handshake.mutex.Lock()
if time.Now().Sub(peer.handshake.lastSentHandshake) < RekeyTimeout { if time.Since(peer.handshake.lastSentHandshake) < RekeyTimeout {
peer.handshake.mutex.Unlock() peer.handshake.mutex.Unlock()
return nil return nil
} }
@ -232,7 +232,7 @@ func (peer *Peer) keepKeyFreshSending() {
return return
} }
nonce := atomic.LoadUint64(&keypair.sendNonce) 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) peer.SendHandshakeInitiation(false)
} }
} }
@ -390,7 +390,7 @@ func (peer *Peer) RoutineNonce() {
keypair = peer.keypairs.Current() keypair = peer.keypairs.Current()
if keypair != nil && keypair.sendNonce < RejectAfterMessages { if keypair != nil && keypair.sendNonce < RejectAfterMessages {
if time.Now().Sub(keypair.created) < RejectAfterTime { if time.Since(keypair.created) < RejectAfterTime {
break break
} }
} }

4
ratelimiter/ratelimiter.go
View File

@ -76,7 +76,7 @@ func (rate *Ratelimiter) Init() {
for key, entry := range rate.tableIPv4 { for key, entry := range rate.tableIPv4 {
entry.Lock() entry.Lock()
if time.Now().Sub(entry.lastTime) > garbageCollectTime { if time.Since(entry.lastTime) > garbageCollectTime {
delete(rate.tableIPv4, key) delete(rate.tableIPv4, key)
} }
entry.Unlock() entry.Unlock()
@ -84,7 +84,7 @@ func (rate *Ratelimiter) Init() {
for key, entry := range rate.tableIPv6 { for key, entry := range rate.tableIPv6 {
entry.Lock() entry.Lock()
if time.Now().Sub(entry.lastTime) > garbageCollectTime { if time.Since(entry.lastTime) > garbageCollectTime {
delete(rate.tableIPv6, key) delete(rate.tableIPv6, key)
} }
entry.Unlock() entry.Unlock()