Apr 4, 2025 · Apr 4, 2025
diff --git a/agent/agent.go b/agent/agent.go
 a.logger.Info(ctx, "connected to coordination RPC")

 // This allows the Close() routine to wait for the coordinator to gracefully disconnect.
 a.closeMutex.Lock()
 ifa.isClosed() {
 return nil
 disconnected := a.setCoordDisconnected()
 ifdisconnected == nil {
 return nil // already closed by something else
 }
 disconnected := make(chan struct{})
 a.coordDisconnected = disconnected
 defer close(disconnected)
 a.closeMutex.Unlock()

 ctrl := tailnet.NewAgentCoordinationController(a.logger, network)
 coordination := ctrl.New(coordinate)
 return <-errCh
 }

 func (a *agent) setCoordDisconnected() chan struct{} {
 a.closeMutex.Lock()
 defer a.closeMutex.Unlock()
 if a.isClosed() {
 return nil
 }
 disconnected := make(chan struct{})
 a.coordDisconnected = disconnected
 return disconnected
 }

 // runDERPMapSubscriber runs a coordinator and returns if a reconnect should occur.
 func (a *agent) runDERPMapSubscriber(ctx context.Context, tClient tailnetproto.DRPCTailnetClient24, network *tailnet.Conn) error {
 defer a.logger.Debug(ctx, "disconnected from derp map RPC")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1518,14 +1518,11 @@ func (a *agent) runCoordinator(ctx context.Context, tClient tailnetproto.DRPCTai
		a.logger.Info(ctx, "connected to coordination RPC")

		// This allows the Close() routine to wait for the coordinator to gracefully disconnect.
		a.closeMutex.Lock()
		ifa.isClosed() {
		return nil
		disconnected := a.setCoordDisconnected()
		ifdisconnected == nil {
		return nil // already closed by something else
		}
		disconnected := make(chan struct{})
		a.coordDisconnected = disconnected
		defer close(disconnected)
		a.closeMutex.Unlock()

		ctrl := tailnet.NewAgentCoordinationController(a.logger, network)
		coordination := ctrl.New(coordinate)
Expand All		@@ -1547,6 +1544,17 @@ func (a *agent) runCoordinator(ctx context.Context, tClient tailnetproto.DRPCTai
		return <-errCh
		}

		func (a *agent) setCoordDisconnected() chan struct{} {
		a.closeMutex.Lock()
		defer a.closeMutex.Unlock()
		if a.isClosed() {
		return nil
		}
		disconnected := make(chan struct{})
		a.coordDisconnected = disconnected
		return disconnected
		}

		// runDERPMapSubscriber runs a coordinator and returns if a reconnect should occur.
		func (a agent) runDERPMapSubscriber(ctx context.Context, tClient tailnetproto.DRPCTailnetClient24, network tailnet.Conn) error {
		defer a.logger.Debug(ctx, "disconnected from derp map RPC")
Expand Down