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

Use Int32n for jitter

Browse Source
This commit is contained in:
Mathias Hall-Andersen 2018-05-05 04:42:17 +02:00
parent d8d592787d
commit 8ba28be732
1 changed files with 48 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
timers.go
View File

@ -201,6 +201,53 @@ func (peer *Peer) RoutineTimerHandler() {
timerKeepalivePersistent.Reset(duration) timerKeepalivePersistent.Reset(duration)
} }
case <-peer.event.handshakeBegin.C:
if !enableHandshake {
continue
}
logDebug.Println(peer, ": Event, Handshake Begin")
err := peer.sendNewHandshake()
// set timeout
jitter := time.Millisecond * time.Duration(rand.Int31n(334))
timerKeepalivePassive.Stop()
timerHandshakeTimeout.Reset(RekeyTimeout + jitter)
if err != nil {
logInfo.Println(peer, ": Failed to send handshake initiation", err)
} else {
logDebug.Println(peer, ": Send handshake initiation (initial)")
}
timerHandshakeDeadline.Reset(RekeyAttemptTime)
// disable further handshakes
peer.event.handshakeBegin.Clear()
enableHandshake = false
case <-peer.event.handshakeCompleted.C:
logInfo.Println(peer, ": Handshake completed")
atomic.StoreInt64(
&peer.stats.lastHandshakeNano,
time.Now().UnixNano(),
)
timerHandshakeTimeout.Stop()
timerHandshakeDeadline.Stop()
peer.timer.sendLastMinuteHandshake.Set(false)
// allow further handshakes
peer.event.handshakeBegin.Clear()
enableHandshake = true
/* timers */ /* timers */
// keep-alive // keep-alive
@ -280,7 +327,7 @@ func (peer *Peer) RoutineTimerHandler() {
// set timeout // set timeout
jitter := time.Millisecond * time.Duration(rand.Uint32()%334) jitter := time.Millisecond * time.Duration(rand.Int31n(334))
timerKeepalivePassive.Stop() timerKeepalivePassive.Stop()
timerHandshakeTimeout.Reset(RekeyTimeout + jitter) timerHandshakeTimeout.Reset(RekeyTimeout + jitter)
@ -310,52 +357,6 @@ func (peer *Peer) RoutineTimerHandler() {
peer.event.handshakeBegin.Clear() peer.event.handshakeBegin.Clear()
enableHandshake = true enableHandshake = true
case <-peer.event.handshakeBegin.C:
if !enableHandshake {
continue
}
logDebug.Println(peer, ": Event, Handshake Begin")
err := peer.sendNewHandshake()
// set timeout
jitter := time.Millisecond * time.Duration(rand.Uint32()%334)
timerKeepalivePassive.Stop()
timerHandshakeTimeout.Reset(RekeyTimeout + jitter)
if err != nil {
logInfo.Println(peer, ": Failed to send handshake initiation", err)
} else {
logDebug.Println(peer, ": Send handshake initiation (initial)")
}
timerHandshakeDeadline.Reset(RekeyAttemptTime)
// disable further handshakes
peer.event.handshakeBegin.Clear()
enableHandshake = false
case <-peer.event.handshakeCompleted.C:
logInfo.Println(peer, ": Handshake completed")
atomic.StoreInt64(
&peer.stats.lastHandshakeNano,
time.Now().UnixNano(),
)
timerHandshakeTimeout.Stop()
timerHandshakeDeadline.Stop()
peer.timer.sendLastMinuteHandshake.Set(false)
// allow further handshakes
peer.event.handshakeBegin.Clear()
enableHandshake = true
} }
} }
} }