Feat: custom TCP Fast Open queue length (#1293)

* Feat: custom TCP Fast Open queue length * Feat: change default TFO queue length to 4096
v2fly · Sep 27, 2021 · be4dd56 · be4dd56
1 parent 7d78683
commit be4dd56
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 27 deletions.
diff --git a/infra/conf/cfgcommon/socketcfg/socket.go b/infra/conf/cfgcommon/socketcfg/socket.go
@@ -11,6 +11,7 @@ type SocketConfig struct {
 	TProxy               string `json:"tproxy"`
 	AcceptProxyProtocol  bool   `json:"acceptProxyProtocol"`
 	TCPKeepAliveInterval int32  `json:"tcpKeepAliveInterval"`
+	TFOQueueLength       uint32 `json:"tcpFastOpenQueueLength"`
 }
 
 // Build implements Buildable.
@@ -23,6 +24,12 @@ func (c *SocketConfig) Build() (*internet.SocketConfig, error) {
 			tfoSettings = internet.SocketConfig_Disable
 		}
 	}
+
+	tfoQueueLength := c.TFOQueueLength
+	if tfoQueueLength == 0 {
+		tfoQueueLength = 4096
+	}
+
 	var tproxy internet.SocketConfig_TProxyMode
 	switch strings.ToLower(c.TProxy) {
 	case "tproxy":
@@ -36,6 +43,7 @@ func (c *SocketConfig) Build() (*internet.SocketConfig, error) {
 	return &internet.SocketConfig{
 		Mark:                 c.Mark,
 		Tfo:                  tfoSettings,
+		TfoQueueLength:       tfoQueueLength,
 		Tproxy:               tproxy,
 		AcceptProxyProtocol:  c.AcceptProxyProtocol,
 		TcpKeepAliveInterval: c.TCPKeepAliveInterval,

diff --git a/infra/conf/v4/transport_test.go b/infra/conf/v4/transport_test.go
@@ -37,12 +37,14 @@ func TestSocketConfig(t *testing.T) {
 		{
 			Input: `{
 				"mark": 1,
-				"tcpFastOpen": true
+				"tcpFastOpen": true,
+				"tcpFastOpenQueueLength": 1024
 			}`,
 			Parser: createParser(),
 			Output: &internet.SocketConfig{
-				Mark: 1,
-				Tfo:  internet.SocketConfig_Enable,
+				Mark:           1,
+				Tfo:            internet.SocketConfig_Enable,
+				TfoQueueLength: 1024,
 			},
 		},
 	})

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
@@ -93,4 +93,6 @@ message SocketConfig {
   bool accept_proxy_protocol = 7;
 
   int32 tcp_keep_alive_interval = 8;
+
+  uint32 tfo_queue_length = 9;
 }
diff --git a/transport/internet/sockopt_linux.go b/transport/internet/sockopt_linux.go
@@ -84,8 +84,8 @@ func applyInboundSocketOptions(network string, fd uintptr, config *SocketConfig)
 	if isTCPSocket(network) {
 		switch config.Tfo {
 		case SocketConfig_Enable:
-			if err := syscall.SetsockoptInt(int(fd), syscall.SOL_TCP, TCP_FASTOPEN, 1); err != nil {
-				return newError("failed to set TCP_FASTOPEN=1").Base(err)
+			if err := syscall.SetsockoptInt(int(fd), syscall.SOL_TCP, TCP_FASTOPEN, int(config.TfoQueueLength)); err != nil {
+				return newError("failed to set TCP_FASTOPEN=", config.TfoQueueLength).Base(err)
 			}
 		case SocketConfig_Disable:
 			if err := syscall.SetsockoptInt(int(fd), syscall.SOL_TCP, TCP_FASTOPEN, 0); err != nil {