From 59c86c90cd7b9c37bee619565a089ff958533b6d Mon Sep 17 00:00:00 2001
From: KevinLiang10 <37811973+KevinLiang10@users.noreply.github.com>
Date: Wed, 25 Jun 2025 14:09:50 -0400
Subject: [PATCH] replace FindServiceConfig with map lookup

Signed-off-by: KevinLiang10 <37811973+KevinLiang10@users.noreply.github.com>
---
 cmd/tailscale/cli/serve_v2.go |  4 ++--
 ipn/serve.go                  | 12 ------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/cmd/tailscale/cli/serve_v2.go b/cmd/tailscale/cli/serve_v2.go
index b4ce51e90..044982055 100644
--- a/cmd/tailscale/cli/serve_v2.go
+++ b/cmd/tailscale/cli/serve_v2.go
@@ -444,7 +444,7 @@ func (e *serveEnv) validateConfig(sc *ipn.ServeConfig, port uint16, wantServe se
 	forService := ipn.IsServiceName(dnsName)
 	var tcpHandlerForPort *ipn.TCPPortHandler
 	if forService {
-		svc := sc.FindServiceConfig(tailcfg.ServiceName(dnsName))
+		svc := sc.Services[tailcfg.ServiceName(dnsName)]
 		if svc == nil {
 			return nil
 		}
@@ -591,7 +591,7 @@ func (e *serveEnv) messageForPort(sc *ipn.ServeConfig, st *ipnstate.Status, dnsN
 			ips = serviceIPMaps[0][svcName]
 		}
 		output.WriteString("\n\n")
-		svc := sc.FindServiceConfig(svcName)
+		svc := sc.Services[svcName]
 		if srvType == serveTypeTun && svc.Tun {
 			output.WriteString(fmt.Sprintf(msgRunningTunService, host))
 			output.WriteString("\n")
diff --git a/ipn/serve.go b/ipn/serve.go
index 1085dee12..b318b0dc9 100644
--- a/ipn/serve.go
+++ b/ipn/serve.go
@@ -339,18 +339,6 @@ func (sc *ServeConfig) FindConfig(port uint16) (*ServeConfig, bool) {
 	return nil, false
 }
 
-// FindServiceConfig finds the ServiceConfig for the given service name when it
-// is hosting the given port.
-func (sc *ServeConfig) FindServiceConfig(svcName tailcfg.ServiceName) *ServiceConfig {
-	if sc == nil {
-		return nil
-	}
-	if svc, ok := sc.Services[svcName]; ok && svc != nil {
-		return svc
-	}
-	return nil
-}
-
 // SetWebHandler sets the given HTTPHandler at the specified host, port,
 // and mount in the serve config. sc.TCP is also updated to reflect web
 // serving usage of the given port.