TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-16 03:31:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnlocal: exclude tvOS devices from taildrop file targets (#10002)

Browse Source
This commit is contained in:
Rhea Ghosh 2023-10-27 16:35:18 -05:00 committed by GitHub
parent f66dc8dc0a
commit 387a98fe28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ipn/ipnlocal/local.go
View File

@ -4605,6 +4605,9 @@ func (b *LocalBackend) FileTargets() ([]*apitype.FileTarget, error) {
if !b.peerIsTaildropTargetLocked(p) { if !b.peerIsTaildropTargetLocked(p) {
continue continue
} }
if p.Hostinfo().OS() == "tvOS" {
continue
}
peerAPI := peerAPIBase(b.netMap, p) peerAPI := peerAPIBase(b.netMap, p)
if peerAPI == "" { if peerAPI == "" {
continue continue

19
ipn/ipnlocal/local_test.go
View File

@ -29,6 +29,7 @@ import (
"tailscale.com/types/netmap" "tailscale.com/types/netmap"
"tailscale.com/types/ptr" "tailscale.com/types/ptr"
"tailscale.com/util/dnsname" "tailscale.com/util/dnsname"
"tailscale.com/util/mak"
"tailscale.com/util/set" "tailscale.com/util/set"
"tailscale.com/wgengine" "tailscale.com/wgengine"
"tailscale.com/wgengine/filter" "tailscale.com/wgengine/filter"
@ -468,6 +469,24 @@ func TestFileTargets(t *testing.T) {
if len(got) != 0 { if len(got) != 0 {
t.Fatalf("unexpected %d peers", len(got)) t.Fatalf("unexpected %d peers", len(got))
} }
var peerMap map[tailcfg.NodeID]tailcfg.NodeView
mak.NonNil(&peerMap)
var nodeID tailcfg.NodeID
nodeID = 1234
peer := &tailcfg.Node{
ID: 1234,
Hostinfo: (&tailcfg.Hostinfo{OS: "tvOS"}).View(),
}
peerMap[nodeID] = peer.View()
b.peers = peerMap
got, err = b.FileTargets()
if err != nil {
t.Fatal(err)
}
if len(got) != 0 {
t.Fatalf("unexpected %d peers", len(got))
}
// (other cases handled by TestPeerAPIBase above) // (other cases handled by TestPeerAPIBase above)
} }