netstack/tcp: user timeout calc from keepalive cfg

ignoramous · ignoramous · commit fa2f8c16d63b · 2024-09-04T05:52:16.000+05:30
diff --git a/intra/netstack/tcp.go b/intra/netstack/tcp.go
@@ -34,7 +34,7 @@ var (
 	defaultKeepAliveInterval = tcpip.KeepaliveIntervalOption(5 * time.Second)
 	defaultKeepAliveCount    = 4 // unacknowledged probes
 	// github.com/tailscale/tailscale/blob/65fe0ba7b5/cmd/derper/derper.go#L75-L78
-	defaultUserTimeout = tcpip.TCPUserTimeoutOption(60 * time.Second)
+	usrTimeout = tcpip.TCPUserTimeoutOption(10*time.Minute + (4 * 5 * time.Second))
 )
 
 type GTCPConnHandler interface {

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ var (`
`34`	`34`	`defaultKeepAliveInterval = tcpip.KeepaliveIntervalOption(5 * time.Second)`
`35`	`35`	`defaultKeepAliveCount = 4 // unacknowledged probes`
`36`	`36`	`// github.com/tailscale/tailscale/blob/65fe0ba7b5/cmd/derper/derper.go#L75-L78`
`37`		`- defaultUserTimeout = tcpip.TCPUserTimeoutOption(60 * time.Second)`
	`37`	`+ usrTimeout = tcpip.TCPUserTimeoutOption(10time.Minute + (4 5 * time.Second))`
`38`	`38`	`)`
`39`	`39`
`40`	`40`	`type GTCPConnHandler interface {`