peer: thread through peer parent context to ping manager

This ensures that when the peer shutsdown, then the ping manager does as
well.

Author: Roasbeef

peer/brontide.go

@@ -731,6 +731,8 @@ func NewBrontide(cfg Config) *Brontide {
 		)
 	}
 
+	peerCtx, _ := p.cg.Create(context.Background())
+
 	p.pingManager = NewPingManager(&PingManagerConfig{
 		NewPingPayload:   newPingPayload,
 		NewPongSize:      randPongSize,
@@ -759,6 +761,7 @@ func NewBrontide(cfg Config) *Brontide {
 					"due to config", logMsg)
 			}
 		},
+		PeerCtx: peerCtx,
 	})
 
 	return p

peer/ping_manager.go

@@ -1,6 +1,7 @@
 package peer
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"sync"
@@ -39,6 +40,11 @@ type PingManagerConfig struct {
 	// expectations for that Pong
 	OnPongFailure func(failureReason error, timeWaitedForPong time.Duration,
 		lastKnownRTT time.Duration)
+
+	// PeerCtx is the context of the peer that owns this ping manager. We'll
+	// use this to ensure that if the peer is shutting down, then we will as
+	// well.
+	PeerCtx context.Context
 }
 
 // PingManager is a structure that is designed to manage the internal state
@@ -201,12 +207,12 @@ func (m *PingManager) pingHandler() {
 			pongSize := int32(len(pong.PongBytes))
 
 			// Save off values we are about to override when we call
-			// resetPingState.
 			expected := m.outstandingPongSize
+			// resetPingState.
 			lastPingTime := m.pingLastSend
 
+			// This is an unexpected pong, we'll continue.
 			if lastPingTime == nil {
-				// This is an unexpected pong, we'll continue.
 				continue
 			}
 
@@ -231,6 +237,9 @@ func (m *PingManager) pingHandler() {
 			m.pingTime.Store(&actualRTT)
 			m.resetPingState()
 
+		case <-m.cfg.PeerCtx.Done():
+			return
+
 		case <-m.quit:
 			return
 		}
@@ -299,5 +308,6 @@ func (m *PingManager) ReceivedPong(msg *lnwire.Pong) {
 	select {
 	case m.pongChan <- msg:
 	case <-m.quit:
+	case <-m.cfg.PeerCtx.Done():
 	}
 }