Add tcpMptcp to sockopt (#2520)

XTLS · Sep 7, 2023 · c00e56c · c00e56c
1 parent 853a866
commit c00e56c
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 26 deletions.
diff --git a/infra/conf/transport_internet.go b/infra/conf/transport_internet.go
@@ -622,6 +622,7 @@ type SocketConfig struct {
 	TCPUserTimeout       int32       `json:"tcpUserTimeout"`
 	V6only               bool        `json:"v6only"`
 	Interface            string      `json:"interface"`
+	TcpMptcp             bool        `json:"tcpMptcp"`
 }
 
 // Build implements Buildable.
@@ -677,6 +678,7 @@ func (c *SocketConfig) Build() (*internet.SocketConfig, error) {
 		TcpUserTimeout:       c.TCPUserTimeout,
 		V6Only:               c.V6only,
 		Interface:            c.Interface,
+		TcpMptcp:             c.TcpMptcp,
 	}, nil
 }
 

diff --git a/transport/internet/config.pb.go b/transport/internet/config.pb.go
diff --git a/transport/internet/config.proto b/transport/internet/config.proto
@@ -110,4 +110,6 @@ message SocketConfig {
   int32 tcp_max_seg = 17;
 
   bool tcp_no_delay = 18;
+
+  bool tcp_mptcp = 19;
 }
diff --git a/transport/internet/system_dialer.go b/transport/internet/system_dialer.go
@@ -81,6 +81,9 @@ func (d *DefaultSystemDialer) Dial(ctx context.Context, src net.Address, dest ne
 	}
 
 	if sockopt != nil || len(d.controllers) > 0 {
+		if sockopt != nil && sockopt.TcpMptcp {
+			dialer.SetMultipathTCP(true)
+		}
 		dialer.Control = func(network, address string, c syscall.RawConn) error {
 			for _, ctl := range d.controllers {
 				if err := ctl(network, address, c); err != nil {

diff --git a/transport/internet/system_listener.go b/transport/internet/system_listener.go
@@ -67,8 +67,13 @@ func (dl *DefaultListener) Listen(ctx context.Context, addr net.Addr, sockopt *S
 		network = addr.Network()
 		address = addr.String()
 		lc.Control = getControlFunc(ctx, sockopt, dl.controllers)
-		if sockopt != nil && (sockopt.TcpKeepAliveInterval != 0 || sockopt.TcpKeepAliveIdle != 0) {
-			lc.KeepAlive = time.Duration(-1)
+		if sockopt != nil {
+			if sockopt.TcpKeepAliveInterval != 0 || sockopt.TcpKeepAliveIdle != 0 {
+				lc.KeepAlive = time.Duration(-1)
+			}
+			if sockopt.TcpMptcp {
+				lc.SetMultipathTCP(true)
+			}
 		}
 	case *net.UnixAddr:
 		lc.Control = nil