Merge pull request #2516 from lucas-clemente/stop-timer

stop the timer when the session's run loop returns

internal/utils/timer.go

@@ -46,3 +46,8 @@ func (t *Timer) Reset(deadline time.Time) {
 func (t *Timer) SetRead() {
 	t.read = true
 }
+
+// Stop stops the timer
+func (t *Timer) Stop() {
+	t.t.Stop()
+}

internal/utils/timer_test.go

@@ -77,4 +77,11 @@ var _ = Describe("Timer", func() {
 		Eventually(t.Chan()).Should(Receive())
 		Consistently(t.Chan()).ShouldNot(Receive())
 	})
+
+	It("stops", func() {
+		t := NewTimer()
+		t.Reset(time.Now().Add(50 * time.Millisecond))
+		t.Stop()
+		Consistently(t.Chan()).ShouldNot(Receive())
+	})
 })

session.go

@@ -472,7 +472,6 @@ func (s *session) preSetup() {
 	s.ctx, s.ctxCancel = context.WithCancel(context.Background())
 	s.handshakeCtx, s.handshakeCtxCancel = context.WithCancel(context.Background())
 
-	s.timer = utils.NewTimer()
 	now := time.Now()
 	s.lastPacketReceivedTime = now
 	s.sessionCreationTime = now
@@ -490,6 +489,8 @@ func (s *session) preSetup() {
 func (s *session) run() error {
 	defer s.ctxCancel()
 
+	s.timer = utils.NewTimer()
+
 	go s.cryptoStreamHandler.RunHandshake()
 	go func() {
 		if err := s.sendQueue.Run(); err != nil {
@@ -605,6 +606,7 @@ runLoop:
 	s.logger.Infof("Connection %s closed.", s.logID)
 	s.cryptoStreamHandler.Close()
 	s.sendQueue.Close()
+	s.timer.Stop()
 	return closeErr.err
 }