TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-03 14:55:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

various: disable MPTCP when setting TCP_USER_TIMEOUT sockopt (#15063)

Browse Source 
There's nothing about it on
https://github.com/multipath-tcp/mptcp_net-next/issues/ but empirically
MPTCP doesn't support this option on awly's kernel 6.13.2 and in GitHub
actions.

Updates #15015

Signed-off-by: Andrew Lytvynov <awly@tailscale.com>
This commit is contained in:
Andrew Lytvynov 2025-02-19 10:41:45 -08:00 committed by GitHub
parent 09982e1918
commit 323747c3e0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/derper/derper.go
View File

@ -324,6 +324,9 @@ func main() {
Control: ktimeout.UserTimeout(*tcpUserTimeout), Control: ktimeout.UserTimeout(*tcpUserTimeout),
KeepAlive: *tcpKeepAlive, KeepAlive: *tcpKeepAlive,
} }
// As of 2025-02-19, MPTCP does not support TCP_USER_TIMEOUT socket option
// set in ktimeout.UserTimeout above.
lc.SetMultipathTCP(false)
quietLogger := log.New(logger.HTTPServerLogFilter{Inner: log.Printf}, "", 0) quietLogger := log.New(logger.HTTPServerLogFilter{Inner: log.Printf}, "", 0)
httpsrv := &http.Server{ httpsrv := &http.Server{

9
net/ktimeout/ktimeout_linux_test.go
View File

@ -4,17 +4,22 @@
package ktimeout package ktimeout
import ( import (
"context"
"net" "net"
"testing" "testing"
"time" "time"
"golang.org/x/net/nettest"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
"tailscale.com/util/must" "tailscale.com/util/must"
) )
func TestSetUserTimeout(t *testing.T) { func TestSetUserTimeout(t *testing.T) {
l := must.Get(nettest.NewLocalListener("tcp")) lc := net.ListenConfig{}
// As of 2025-02-19, MPTCP does not support TCP_USER_TIMEOUT socket option
// set in ktimeout.UserTimeout above.
lc.SetMultipathTCP(false)
l := must.Get(lc.Listen(context.Background(), "tcp", "localhost:0"))
defer l.Close() defer l.Close()
var err error var err error