TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-06-28 19:18:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace FindServiceConfig with map lookup

Browse Source 
Signed-off-by: KevinLiang10 <37811973+KevinLiang10@users.noreply.github.com>
This commit is contained in:
KevinLiang10 2025-06-25 14:09:50 -04:00
parent 32cc03db20
commit 59c86c90cd
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/tailscale/cli/serve_v2.go
View File

@ -444,7 +444,7 @@ func (e *serveEnv) validateConfig(sc *ipn.ServeConfig, port uint16, wantServe se
forService := ipn.IsServiceName(dnsName) forService := ipn.IsServiceName(dnsName)
var tcpHandlerForPort *ipn.TCPPortHandler var tcpHandlerForPort *ipn.TCPPortHandler
if forService { if forService {
svc := sc.FindServiceConfig(tailcfg.ServiceName(dnsName)) svc := sc.Services[tailcfg.ServiceName(dnsName)]
if svc == nil { if svc == nil {
return nil return nil
} }
@ -591,7 +591,7 @@ func (e *serveEnv) messageForPort(sc *ipn.ServeConfig, st *ipnstate.Status, dnsN
ips = serviceIPMaps[0][svcName] ips = serviceIPMaps[0][svcName]
} }
output.WriteString("\n\n") output.WriteString("\n\n")
svc := sc.FindServiceConfig(svcName) svc := sc.Services[svcName]
if srvType == serveTypeTun && svc.Tun { if srvType == serveTypeTun && svc.Tun {
output.WriteString(fmt.Sprintf(msgRunningTunService, host)) output.WriteString(fmt.Sprintf(msgRunningTunService, host))
output.WriteString("\n") output.WriteString("\n")

12
ipn/serve.go
View File

@ -339,18 +339,6 @@ func (sc *ServeConfig) FindConfig(port uint16) (*ServeConfig, bool) {
return nil, false 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, // SetWebHandler sets the given HTTPHandler at the specified host, port,
// and mount in the serve config. sc.TCP is also updated to reflect web // and mount in the serve config. sc.TCP is also updated to reflect web
// serving usage of the given port. // serving usage of the given port.