From a55a03d5ffc42d97cce9e0a385d90100ac17486d Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@tailscale.com>
Date: Sat, 27 Feb 2021 21:48:00 -0800
Subject: [PATCH] wgengine: let LinkMonitor be passed in to NewUserspaceEngine

Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
---
 wgengine/userspace.go | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/wgengine/userspace.go b/wgengine/userspace.go
index c6d1d9394..d1d447484 100644
--- a/wgengine/userspace.go
+++ b/wgengine/userspace.go
@@ -96,6 +96,7 @@ type userspaceEngine struct {
 	resolver          *tsdns.Resolver
 	magicConn         *magicsock.Conn
 	linkMon           *monitor.Mon
+	linkMonOwned      bool   // whether we created linkMon (and thus need to close it)
 	linkMonUnregister func() // unsubscribes from changes; used regardless of linkMonOwned
 
 	testMaybeReconfigHook func() // for tests; if non-nil, fires if maybeReconfigWireguardLocked called
@@ -148,6 +149,10 @@ type Config struct {
 	// If nil, wgengine/router.New is used.
 	RouterGen RouterGen
 
+	// LinkMonitor optionally provides an existing link monitor to re-use.
+	// If nil, a new link monitor is created.
+	LinkMonitor *monitor.Mon
+
 	// ListenPort is the port on which the engine will listen.
 	// If zero, a port is automatically selected.
 	ListenPort uint16
@@ -242,12 +247,17 @@ func newUserspaceEngine(logf logger.Logf, rawTUNDev tun.Device, conf Config) (_
 	e.linkState, _ = getLinkState()
 	logf("link state: %+v", e.linkState)
 
-	mon, err := monitor.New(logf)
-	if err != nil {
-		return nil, err
+	if conf.LinkMonitor != nil {
+		e.linkMon = conf.LinkMonitor
+	} else {
+		mon, err := monitor.New(logf)
+		if err != nil {
+			return nil, err
+		}
+		closePool.add(mon)
+		e.linkMon = mon
+		e.linkMonOwned = true
 	}
-	closePool.add(mon)
-	e.linkMon = mon
 	unregisterMonWatch := e.linkMon.RegisterChangeCallback(func() {
 		e.LinkChange(false)
 		tshttpproxy.InvalidateCache()
@@ -270,6 +280,7 @@ func newUserspaceEngine(logf logger.Logf, rawTUNDev tun.Device, conf Config) (_
 		IdleFunc:         e.tundev.IdleDuration,
 		NoteRecvActivity: e.noteReceiveActivity,
 	}
+	var err error
 	e.magicConn, err = magicsock.NewConn(magicsockOpts)
 	if err != nil {
 		return nil, fmt.Errorf("wgengine: %v", err)
@@ -1237,7 +1248,9 @@ func (e *userspaceEngine) Close() {
 	e.resolver.Close()
 	e.magicConn.Close()
 	e.linkMonUnregister()
-	e.linkMon.Close()
+	if e.linkMonOwned {
+		e.linkMon.Close()
+	}
 	e.router.Close()
 	e.wgdev.Close()
 	e.tundev.Close()