Revert "Peer timer teardown"

This reverts commit d73f960aab86b9a12b0b7d18aa80ce1d4f130695.

Problems with deadlocking arises due to orphaned packets in per-peer
queues. Additional work on this issue continues in seperate branch.

1 files changed, 59 insertions, 91 deletions

diff --git a/src/timers.go b/src/timers.go
index f2fed30..ee47393 100644
--- a/src/timers.go
+++ b/src/timers.go
@@ -4,17 +4,10 @@ import (
 	"bytes"

 	"encoding/binary"

 	"math/rand"

-	"sync"

 	"sync/atomic"

 	"time"

 )

 

-/* NOTE:

- * Notion of validity

- *

- *

- */

-

 /* Called when a new authenticated message has been send

  *

  */

@@ -51,25 +44,25 @@ func (peer *Peer) KeepKeyFreshReceiving() {
 	send := nonce > RekeyAfterMessages || time.Now().Sub(kp.created) > RekeyAfterTimeReceiving

 	if send {

 		// do a last minute attempt at initiating a new handshake

-		peer.timer.sendLastMinuteHandshake = true

 		peer.signal.handshakeBegin.Send()

+		peer.timer.sendLastMinuteHandshake = true

 	}

 }

 

 /* Queues a keep-alive if no packets are queued for peer

  */

 func (peer *Peer) SendKeepAlive() bool {

-	if len(peer.queue.nonce) != 0 {

-		return false

-	}

 	elem := peer.device.NewOutboundElement()

 	elem.packet = nil

-	select {

-	case peer.queue.nonce <- elem:

-		return true

-	default:

-		return false

+	if len(peer.queue.nonce) == 0 {

+		select {

+		case peer.queue.nonce <- elem:

+			return true

+		default:

+			return false

+		}

 	}

+	return true

 }

 

 /* Event:

@@ -77,7 +70,9 @@ func (peer *Peer) SendKeepAlive() bool {
  */

 func (peer *Peer) TimerDataSent() {

 	peer.timer.keepalivePassive.Stop()

-	peer.timer.handshakeNew.Start(NewHandshakeTime)

+	if peer.timer.newHandshake.Pending() {

+		peer.timer.newHandshake.Reset(NewHandshakeTime)

+	}

 }

 

 /* Event:

@@ -96,7 +91,7 @@ func (peer *Peer) TimerDataReceived() {
  * Any (authenticated) packet received

  */

 func (peer *Peer) TimerAnyAuthenticatedPacketReceived() {

-	peer.timer.handshakeNew.Stop()

+	peer.timer.newHandshake.Stop()

 }

 

 /* Event:

@@ -120,6 +115,10 @@ func (peer *Peer) TimerAnyAuthenticatedPacketTraversal() {
  * - First transport message under the "next" key

  */

 func (peer *Peer) TimerHandshakeComplete() {

+	atomic.StoreInt64(

+		&peer.stats.lastHandshakeNano,

+		time.Now().UnixNano(),

+	)

 	peer.signal.handshakeCompleted.Send()

 	peer.device.log.Info.Println("Negotiated new handshake for", peer.String())

 }

@@ -140,75 +139,13 @@ func (peer *Peer) TimerEphemeralKeyCreated() {
 	peer.timer.zeroAllKeys.Reset(RejectAfterTime * 3)

 }

 

-/* Sends a new handshake initiation message to the peer (endpoint)

- */

-func (peer *Peer) sendNewHandshake() error {

-

-	// temporarily disable the handshake complete signal

-

-	peer.signal.handshakeCompleted.Disable()

-

-	// create initiation message

-

-	msg, err := peer.device.CreateMessageInitiation(peer)

-	if err != nil {

-		return err

-	}

-

-	// marshal handshake message

-

-	var buff [MessageInitiationSize]byte

-	writer := bytes.NewBuffer(buff[:0])

-	binary.Write(writer, binary.LittleEndian, msg)

-	packet := writer.Bytes()

-	peer.mac.AddMacs(packet)

-

-	// send to endpoint

-

-	peer.TimerAnyAuthenticatedPacketTraversal()

-

-	err = peer.SendBuffer(packet)

-	if err == nil {

-		peer.signal.handshakeCompleted.Enable()

-	}

-

-	// set timeout

-

-	jitter := time.Millisecond * time.Duration(rand.Uint32()%334)

-

-	peer.timer.keepalivePassive.Stop()

-	peer.timer.handshakeTimeout.Reset(RekeyTimeout + jitter)

-

-	return err

-}

-

-func (peer *Peer) RoutineTimerHandler(ready *sync.WaitGroup) {

+func (peer *Peer) RoutineTimerHandler() {

 	device := peer.device

 

 	logInfo := device.log.Info

 	logDebug := device.log.Debug

 	logDebug.Println("Routine, timer handler, started for peer", peer.String())

 

-	// reset all timers

-

-	peer.timer.keepalivePassive.Stop()

-	peer.timer.handshakeDeadline.Stop()

-	peer.timer.handshakeTimeout.Stop()

-	peer.timer.handshakeNew.Stop()

-	peer.timer.zeroAllKeys.Stop()

-

-	interval := atomic.LoadUint64(&peer.persistentKeepaliveInterval)

-	if interval > 0 {

-		duration := time.Duration(interval) * time.Second

-		peer.timer.keepalivePersistent.Reset(duration)

-	}

-

-	// signal that timers are reset

-

-	ready.Done()

-

-	// handle timer events

-

 	for {

 		select {

 

@@ -221,7 +158,6 @@ func (peer *Peer) RoutineTimerHandler(ready *sync.WaitGroup) {
 			interval := atomic.LoadUint64(&peer.persistentKeepaliveInterval)

 			if interval > 0 {

 				logDebug.Println("Sending keep-alive to", peer.String())

-				peer.timer.keepalivePassive.Stop()

 				peer.SendKeepAlive()

 			}

 

@@ -232,8 +168,8 @@ func (peer *Peer) RoutineTimerHandler(ready *sync.WaitGroup) {
 			peer.SendKeepAlive()

 

 			if peer.timer.needAnotherKeepalive {

-				peer.timer.needAnotherKeepalive = false

 				peer.timer.keepalivePassive.Reset(KeepaliveTimeout)

+				peer.timer.needAnotherKeepalive = false

 			}

 

 		// clear key material timer

@@ -277,7 +213,7 @@ func (peer *Peer) RoutineTimerHandler(ready *sync.WaitGroup) {
 

 		// handshake timers

 

-		case <-peer.timer.handshakeNew.Wait():

+		case <-peer.timer.newHandshake.Wait():

 			logInfo.Println("Retrying handshake with", peer.String())

 			peer.signal.handshakeBegin.Send()

 

@@ -332,16 +268,48 @@ func (peer *Peer) RoutineTimerHandler(ready *sync.WaitGroup) {
 			logInfo.Println(

 				"Handshake completed for:", peer.String())

 

-			atomic.StoreInt64(

-				&peer.stats.lastHandshakeNano,

-				time.Now().UnixNano(),

-			)

-

 			peer.timer.handshakeTimeout.Stop()

 			peer.timer.handshakeDeadline.Stop()

 			peer.signal.handshakeBegin.Enable()

-

-			peer.timer.sendLastMinuteHandshake = false

 		}

 	}

 }

+

+/* Sends a new handshake initiation message to the peer (endpoint)

+ */

+func (peer *Peer) sendNewHandshake() error {

+

+	// temporarily disable the handshake complete signal

+

+	peer.signal.handshakeCompleted.Disable()

+

+	// create initiation message

+

+	msg, err := peer.device.CreateMessageInitiation(peer)

+	if err != nil {

+		return err

+	}

+

+	// marshal handshake message

+

+	var buff [MessageInitiationSize]byte

+	writer := bytes.NewBuffer(buff[:0])

+	binary.Write(writer, binary.LittleEndian, msg)

+	packet := writer.Bytes()

+	peer.mac.AddMacs(packet)

+

+	// send to endpoint

+

+	err = peer.SendBuffer(packet)

+	if err == nil {

+		peer.TimerAnyAuthenticatedPacketTraversal()

+		peer.signal.handshakeCompleted.Enable()

+	}

+

+	// set timeout

+

+	jitter := time.Millisecond * time.Duration(rand.Uint32()%334)

+	peer.timer.handshakeTimeout.Reset(RekeyTimeout + jitter)

+

+	return err

+}