TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-22 08:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn: update AddPeer to include TaildropTarget (#15091)

Browse Source 
We previously were not merging in the TaildropTarget into the PeerStatus because we did not update AddPeer.

Updates tailscale/tailscale#14393

Signed-off-by: kari-ts <kari@tailscale.com>
This commit is contained in:
kari-ts 2025-02-28 14:17:28 -08:00 committed by GitHub
parent 74d7d8a77b
commit dc18091678
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ipn/ipnlocal/local.go
View File

@ -6709,7 +6709,7 @@ func (b *LocalBackend) FileTargets() ([]*apitype.FileTarget, error) {
} }
func (b *LocalBackend) taildropTargetStatus(p tailcfg.NodeView) ipnstate.TaildropTargetStatus { func (b *LocalBackend) taildropTargetStatus(p tailcfg.NodeView) ipnstate.TaildropTargetStatus {
if b.netMap == nil || b.state != ipn.Running { if b.state != ipn.Running {
return ipnstate.TaildropTargetIpnStateNotRunning return ipnstate.TaildropTargetIpnStateNotRunning
} }
if b.netMap == nil { if b.netMap == nil {

8
ipn/ipnstate/ipnstate.go
View File

@ -216,6 +216,11 @@ type PeerStatusLite struct {
} }
// PeerStatus describes a peer node and its current state. // PeerStatus describes a peer node and its current state.
// WARNING: The fields in PeerStatus are merged by the AddPeer method in the StatusBuilder.
// When adding a new field to PeerStatus, you must update AddPeer to handle merging
// the new field. The AddPeer function is responsible for combining multiple updates
// to the same peer, and any new field that is not merged properly may lead to
// inconsistencies or lost data in the peer status.
type PeerStatus struct { type PeerStatus struct {
ID tailcfg.StableNodeID ID tailcfg.StableNodeID
PublicKey key.NodePublic PublicKey key.NodePublic
@ -533,6 +538,9 @@ func (sb *StatusBuilder) AddPeer(peer key.NodePublic, st *PeerStatus) {
if v := st.Capabilities; v != nil { if v := st.Capabilities; v != nil {
e.Capabilities = v e.Capabilities = v
} }
if v := st.TaildropTarget; v != TaildropTargetUnknown {
e.TaildropTarget = v
}
e.Location = st.Location e.Location = st.Location
} }