Rewrite timers and related state machines

1 files changed, 12 insertions, 15 deletions

diff --git a/constants.go b/constants.go
index 04b75d7..01af1bb 100644
--- a/constants.go
+++ b/constants.go
@@ -12,21 +12,18 @@ import (
 /* Specification constants */
 
 const (
-	RekeyAfterMessages     = (1 << 64) - (1 << 16) - 1
-	RejectAfterMessages    = (1 << 64) - (1 << 4) - 1
-	RekeyAfterTime         = time.Second * 120
-	RekeyAttemptTime       = time.Second * 90
-	RekeyTimeout           = time.Second * 5
-	RejectAfterTime        = time.Second * 180
-	KeepaliveTimeout       = time.Second * 10
-	CookieRefreshTime      = time.Second * 120
-	HandshakeInitationRate = time.Second / 20
-	PaddingMultiple        = 16
-)
-
-const (
-	RekeyAfterTimeReceiving = RejectAfterTime - KeepaliveTimeout - RekeyTimeout
-	NewHandshakeTime        = KeepaliveTimeout + RekeyTimeout // upon failure to acknowledge transport message
+	RekeyAfterMessages      = (1 << 64) - (1 << 16) - 1
+	RejectAfterMessages     = (1 << 64) - (1 << 4) - 1
+	RekeyAfterTime          = time.Second * 120
+	RekeyAttemptTime        = time.Second * 90
+	RekeyTimeout            = time.Second * 5
+	MaxTimerHandshakes      = 90 / 5 /* RekeyAttemptTime / RekeyTimeout */
+	RekeyTimeoutJitterMaxMs = 334
+	RejectAfterTime         = time.Second * 180
+	KeepaliveTimeout        = time.Second * 10
+	CookieRefreshTime       = time.Second * 120
+	HandshakeInitationRate  = time.Second / 20
+	PaddingMultiple         = 16
 )
 
 /* Implementation specific constants */