Add tcpKeepAliveInterval in transport sockopt (#754)

Co-authored-by: Ahmad Karimi <ak12hastam@gmail.com> Co-authored-by: Shelikhoo <xiaokangwang@outlook.com>
XTLS · Oct 12, 2021 · 4bb6170 · 4bb6170
1 parent ef4c638
commit 4bb6170
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 28 deletions.
diff --git a/infra/conf/transport_internet.go b/infra/conf/transport_internet.go
@@ -489,6 +489,8 @@ type SocketConfig struct {
 	AcceptProxyProtocol bool        `json:"acceptProxyProtocol"`
 	DomainStrategy      string      `json:"domainStrategy"`
 	DialerProxy         string      `json:"dialerProxy"`
+
+	TCPKeepAliveInterval int32 `json:"tcpKeepAliveInterval"`
 }
 
 // Build implements Buildable.
@@ -529,12 +531,13 @@ func (c *SocketConfig) Build() (*internet.SocketConfig, error) {
 	}
 
 	return &internet.SocketConfig{
-		Mark:                c.Mark,
-		Tfo:                 tfo,
-		Tproxy:              tproxy,
-		DomainStrategy:      dStrategy,
-		AcceptProxyProtocol: c.AcceptProxyProtocol,
-		DialerProxy:         c.DialerProxy,
+		Mark:                 c.Mark,
+		Tfo:                  tfo,
+		Tproxy:               tproxy,
+		DomainStrategy:       dStrategy,
+		AcceptProxyProtocol:  c.AcceptProxyProtocol,
+		DialerProxy:          c.DialerProxy,
+		TcpKeepAliveInterval: c.TCPKeepAliveInterval,
 	}, 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
@@ -90,5 +90,8 @@ message SocketConfig {
   bool accept_proxy_protocol = 7;
 
   DomainStrategy domain_strategy = 8;
+
   string dialer_proxy = 9;
+
+  int32 tcp_keep_alive_interval = 10;
 }
diff --git a/transport/internet/sockopt_linux.go b/transport/internet/sockopt_linux.go
@@ -57,6 +57,12 @@ func applyOutboundSocketOptions(network string, address string, fd uintptr, conf
 				return newError("failed to set TCP_FASTOPEN_CONNECT=", tfo).Base(err)
 			}
 		}
+
+		if config.TcpKeepAliveInterval != 0 {
+			if err := syscall.SetsockoptInt(int(fd), syscall.IPPROTO_TCP, syscall.TCP_KEEPINTVL, int(config.TcpKeepAliveInterval)); err != nil {
+				return newError("failed to set TCP_KEEPINTVL", err)
+			}
+		}
 	}
 
 	if config.Tproxy.IsEnabled() {
@@ -81,6 +87,12 @@ func applyInboundSocketOptions(network string, fd uintptr, config *SocketConfig)
 				return newError("failed to set TCP_FASTOPEN=", tfo).Base(err)
 			}
 		}
+
+		if config.TcpKeepAliveInterval != 0 {
+			if err := syscall.SetsockoptInt(int(fd), syscall.IPPROTO_TCP, syscall.TCP_KEEPINTVL, int(config.TcpKeepAliveInterval)); err != nil {
+				return newError("failed to set TCP_KEEPINTVL", err)
+			}
+		}
 	}
 
 	if config.Tproxy.IsEnabled() {