TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-20 11:58:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/derper: apply TCP keepalive and timeout to TLS as well

Browse Source 
I missed a case in the earlier patch, and so we're still sending 15s TCP
keepalive for TLS connections, now adjusted there too.

Updates tailscale/corp#17587
Updates #3363

Signed-off-by: James Tucker <james@tailscale.com>
This commit is contained in:
James Tucker 2024-02-23 18:23:32 -08:00 committed by James Tucker
parent c9b6d19fc9
commit 0c5e65eb3f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/derper/derper.go
View File

@ -324,7 +324,7 @@ func main() {
} }
}() }()
} }
err = rateLimitedListenAndServeTLS(httpsrv) err = rateLimitedListenAndServeTLS(httpsrv, &lc)
} else { } else {
log.Printf("derper: serving on %s", *addr) log.Printf("derper: serving on %s", *addr)
var ln net.Listener var ln net.Listener
@ -397,8 +397,8 @@ func defaultMeshPSKFile() string {
return "" return ""
} }
func rateLimitedListenAndServeTLS(srv *http.Server) error { func rateLimitedListenAndServeTLS(srv *http.Server, lc *net.ListenConfig) error {
ln, err := net.Listen("tcp", cmp.Or(srv.Addr, ":https")) ln, err := lc.Listen(context.Background(), "tcp", cmp.Or(srv.Addr, ":https"))
if err != nil { if err != nil {
return err return err
} }