Jan 26, 2023 · Jan 26, 2023
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go

 func (api*API)dialWorkspaceAgentTailnet(r*http.Request,agentID uuid.UUID) (*codersdk.AgentConn,error) {
 clientConn,serverConn:=net.Pipe()
 gofunc() {
 <-r.Context().Done()
 _=clientConn.Close()
 _=serverConn.Close()
 }()

 derpMap:=api.DERPMap.Clone()
 for_,region:=rangederpMap.Regions {
 }

 sendNodes,_:=tailnet.ServeCoordinator(clientConn,func(node []*tailnet.Node)error {
 returnconn.UpdateNodes(node)
 err:=conn.RemoveAllPeers()
 iferr!=nil {
 returnxerrors.Errorf("remove all peers: %w",err)
 }

 err=conn.UpdateNodes(node)
 iferr!=nil {
 returnxerrors.Errorf("update nodes: %w",err)
 }
 returnnil
 })
 conn.SetNodeCallback(sendNodes)
 gofunc() {
 }()
 return&codersdk.AgentConn{
 Conn:conn,
 CloseFunc:func() {
 _=clientConn.Close()
 _=serverConn.Close()
 },
 },nil
 }

diff --git a/tailnet/conn.go b/tailnet/conn.go
 c.wireguardEngine.SetDERPMap(derpMap)
 }

 func (c*Conn)RemoveAllPeers()error {
 c.mutex.Lock()
 deferc.mutex.Unlock()

 c.netMap.Peers= []*tailcfg.Node{}
 c.peerMap=map[tailcfg.NodeID]*tailcfg.Node{}
 netMapCopy:=*c.netMap
 c.wireguardEngine.SetNetworkMap(&netMapCopy)
 cfg,err:=nmcfg.WGCfg(c.netMap,Logger(c.logger.Named("wgconfig")),netmap.AllowSingleHosts,"")
 iferr!=nil {
 returnxerrors.Errorf("update wireguard config: %w",err)
 }
 err=c.wireguardEngine.Reconfig(cfg,c.wireguardRouter,&dns.Config{},&tailcfg.Debug{})
 iferr!=nil {
 ifc.isClosed() {
 returnnil
 }
 iferrors.Is(err,wgengine.ErrNoChanges) {
 returnnil
 }
 returnxerrors.Errorf("reconfig: %w",err)
 }
 returnnil
 }

 // UpdateNodes connects with a set of peers. This can be constantly updated,
 // and peers will continually be reconnected as necessary.
 func (c*Conn)UpdateNodes(nodes []*Node)error {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -402,11 +402,6 @@ func (api API) workspaceAgentListeningPorts(rw http.ResponseWriter, r http.Req

		func (apiAPI)dialWorkspaceAgentTailnet(rhttp.Request,agentID uuid.UUID) (*codersdk.AgentConn,error) {
		clientConn,serverConn:=net.Pipe()
		gofunc() {
		<-r.Context().Done()
		_=clientConn.Close()
		_=serverConn.Close()
		}()

		derpMap:=api.DERPMap.Clone()
		for_,region:=rangederpMap.Regions {
Expand DownExpand Up		@@ -453,7 +448,16 @@ func (api API) dialWorkspaceAgentTailnet(r http.Request, agentID uuid.UUID) (*
		}

		sendNodes,_:=tailnet.ServeCoordinator(clientConn,func(node []*tailnet.Node)error {
		returnconn.UpdateNodes(node)
		err:=conn.RemoveAllPeers()
		iferr!=nil {
		returnxerrors.Errorf("remove all peers: %w",err)
		}

		err=conn.UpdateNodes(node)
		iferr!=nil {
		returnxerrors.Errorf("update nodes: %w",err)
		}
		returnnil
		})
		conn.SetNodeCallback(sendNodes)
		gofunc() {
Expand All		@@ -465,6 +469,10 @@ func (api API) dialWorkspaceAgentTailnet(r http.Request, agentID uuid.UUID) (*
		}()
		return&codersdk.AgentConn{
		Conn:conn,
		CloseFunc:func() {
		_=clientConn.Close()
		_=serverConn.Close()
		},
		},nil
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -325,6 +325,31 @@ func (c Conn) SetDERPMap(derpMap tailcfg.DERPMap) {
		c.wireguardEngine.SetDERPMap(derpMap)
		}

		func (c*Conn)RemoveAllPeers()error {
		c.mutex.Lock()
		deferc.mutex.Unlock()

		c.netMap.Peers= []*tailcfg.Node{}
		c.peerMap=map[tailcfg.NodeID]*tailcfg.Node{}
		netMapCopy:=*c.netMap
		c.wireguardEngine.SetNetworkMap(&netMapCopy)
		cfg,err:=nmcfg.WGCfg(c.netMap,Logger(c.logger.Named("wgconfig")),netmap.AllowSingleHosts,"")
		iferr!=nil {
		returnxerrors.Errorf("update wireguard config: %w",err)
		}
		err=c.wireguardEngine.Reconfig(cfg,c.wireguardRouter,&dns.Config{},&tailcfg.Debug{})
		iferr!=nil {
		ifc.isClosed() {
		returnnil
		}
		iferrors.Is(err,wgengine.ErrNoChanges) {
		returnnil
		}
		returnxerrors.Errorf("reconfig: %w",err)
		}
		returnnil
		}

		// UpdateNodes connects with a set of peers. This can be constantly updated,
		// and peers will continually be reconnected as necessary.
		func (cConn)UpdateNodes(nodes []Node)error {
Expand Down