wgengine/netstack: add an Impl.Close method for tests
@@ -79,6 +79,8 @@ type Impl struct {
mc *magicsock.Conn
logf logger.Logf
dialer *tsdial.Dialer
+ ctx context.Context // alive until Close
+ ctxCancel context.CancelFunc // called on Close
// atomicIsLocalIPFunc holds a func that reports whether an IP
// is a local (non-subnet) Tailscale IP address of this
@@ -152,10 +154,16 @@ func Create(logf logger.Logf, tundev *tstun.Wrapper, e wgengine.Engine, mc *magi
dialer: dialer,
connsOpenBySubnetIP: make(map[netaddr.IP]int),
}
+ ns.ctx, ns.ctxCancel = context.WithCancel(context.Background())
ns.atomicIsLocalIPFunc.Store(tsaddr.NewContainsIPFunc(nil))
return ns, nil
}
+func (ns *Impl) Close() error {
+ ns.ctxCancel()
+ return nil
+}
+
// wrapProtoHandler returns protocol handler h wrapped in a version
// that dynamically reconfigures ns's subnet addresses as needed for
// outbound traffic.
@@ -347,8 +355,12 @@ func (ns *Impl) DialContextUDP(ctx context.Context, ipp netaddr.IPPort) (*gonet.
func (ns *Impl) injectOutbound() {
for {
- packetInfo, ok := ns.linkEP.ReadContext(context.Background())
+ packetInfo, ok := ns.linkEP.ReadContext(ns.ctx)
if !ok {
+ if ns.ctx.Err() != nil {
+ // Return without logging.
+ return
+ }
ns.logf("[v2] ReadContext-for-write = ok=false")
continue
}
