mirrors/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2026-05-11 15:16:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

lanscaping: remove proxymap (a userspace mode thing)

Browse Source 
-rwxr-xr-x@ 1 bradfitz  staff  13976098 Jan 10 21:41 /Users/bradfitz/bin/tailscaled.min
-rwxr-xr-x@ 1 bradfitz  staff  14942360 Jan 10 21:41 /Users/bradfitz/bin/tailscaled.minlinux

Change-Id: I35a1ff01fba619839c1e5671b8c06ed722a05948
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2025-01-10 21:41:58 -08:00
parent d086f952b9
commit 9bf8966c26
3 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/tailscaled/depaware-minlinux.txt
View File

@ -129,7 +129,6 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de
tailscale.com/omit from tailscale.com/ipn/conffile
tailscale.com/paths from tailscale.com/cmd/tailscaled+
💣 tailscale.com/portlist from tailscale.com/ipn/ipnlocal
tailscale.com/proxymap from tailscale.com/tsd
tailscale.com/safesocket from tailscale.com/cmd/tailscaled+
tailscale.com/syncs from tailscale.com/cmd/tailscaled+
tailscale.com/tailcfg from tailscale.com/client/tailscale/apitype+

25
ipn/ipnlocal/local.go
View File

@ -1299,30 +1299,7 @@ func (b *LocalBackend) WhoIs(proto string, ipp netip.AddrPort) (n tailcfg.NodeVi
nid, ok := b.nodeByAddr[ipp.Addr()]
if !ok {
var ip netip.Addr
if ipp.Port() != 0 {
var protos []string
if proto != "" {
protos = []string{proto}
} else {
// If the user didn't specify a protocol, try all of them
protos = []string{"tcp", "udp"}
}
for _, tryproto := range protos {
ip, ok = b.sys.ProxyMapper().WhoIsIPPort(tryproto, ipp)
if ok {
break
}
}
}
if !ok {
return failf("no IP found in ProxyMapper for %v", ipp)
}
nid, ok = b.nodeByAddr[ip]
if !ok {
return failf("no node for proxymapped IP %v", ip)
}
return failf("no node for proxymapped IP %v", ipp.Addr())
}
if b.netMap == nil {
return failf("no netmap")

7
tsd/tsd.go
View File

@ -30,7 +30,6 @@ import (
"tailscale.com/net/netmon"
"tailscale.com/net/tsdial"
"tailscale.com/net/tstun"
"tailscale.com/proxymap"
"tailscale.com/types/netmap"
"tailscale.com/util/usermetric"
"tailscale.com/wgengine"
@ -64,7 +63,6 @@ type System struct {
onlyNetstack bool
controlKnobs controlknobs.Knobs
proxyMap proxymap.Mapper
healthTracker health.Tracker
userMetricsRegistry usermetric.Registry
@ -134,11 +132,6 @@ func (s *System) ControlKnobs() *controlknobs.Knobs {
return &s.controlKnobs
}
// ProxyMapper returns the ephemeral ip:port mapper.
func (s *System) ProxyMapper() *proxymap.Mapper {
return &s.proxyMap
}
// HealthTracker returns the system health tracker.
func (s *System) HealthTracker() *health.Tracker {
return &s.healthTracker