From 9bf8966c26204eaf05d8ca11957670d2153cf768 Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@tailscale.com>
Date: Fri, 10 Jan 2025 21:41:58 -0800
Subject: [PATCH] lanscaping: remove proxymap (a userspace mode thing)

-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>
---
 cmd/tailscaled/depaware-minlinux.txt |  1 -
 ipn/ipnlocal/local.go                | 25 +------------------------
 tsd/tsd.go                           |  7 -------
 3 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/cmd/tailscaled/depaware-minlinux.txt b/cmd/tailscaled/depaware-minlinux.txt
index fc56c1b23..e3139c2ef 100644
--- a/cmd/tailscaled/depaware-minlinux.txt
+++ b/cmd/tailscaled/depaware-minlinux.txt
@@ -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+
diff --git a/ipn/ipnlocal/local.go b/ipn/ipnlocal/local.go
index 9628413ad..9d6af564e 100644
--- a/ipn/ipnlocal/local.go
+++ b/ipn/ipnlocal/local.go
@@ -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")
diff --git a/tsd/tsd.go b/tsd/tsd.go
index acd09560c..a463edffe 100644
--- a/tsd/tsd.go
+++ b/tsd/tsd.go
@@ -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