Sockopt config: Add penetrate for XHTTP U-D-S, Remove tcpNoDelay

Now `sockopt` can be shared via `extra`, and be replaced with upload's forcibly. Closes #4227
XTLS · Dec 31, 2024 · 369d894 · 369d894
1 parent 4ce65fc
commit 369d894
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 59 deletions.
diff --git a/infra/conf/transport_internet.go b/infra/conf/transport_internet.go
@@ -262,7 +262,6 @@ func (c *SplitHTTPConfig) Build() (proto.Message, error) {
 		extra.Host = c.Host
 		extra.Path = c.Path
 		extra.Mode = c.Mode
-		extra.Extra = c.Extra
 		c = &extra
 	}
 
@@ -318,9 +317,6 @@ func (c *SplitHTTPConfig) Build() (proto.Message, error) {
 		if c.Mode == "stream-one" {
 			return nil, errors.New(`Can not use "downloadSettings" in "stream-one" mode.`)
 		}
-		if c.Extra != nil {
-			c.DownloadSettings.SocketSettings = nil
-		}
 		var err error
 		if config.DownloadSettings, err = c.DownloadSettings.Build(); err != nil {
 			return nil, errors.New(`Failed to build "downloadSettings".`).Base(err)
@@ -689,7 +685,7 @@ type SocketConfig struct {
 	TCPCongestion        string                 `json:"tcpCongestion"`
 	TCPWindowClamp       int32                  `json:"tcpWindowClamp"`
 	TCPMaxSeg            int32                  `json:"tcpMaxSeg"`
-	TcpNoDelay           bool                   `json:"tcpNoDelay"`
+	Penetrate            bool                   `json:"penetrate"`
 	TCPUserTimeout       int32                  `json:"tcpUserTimeout"`
 	V6only               bool                   `json:"v6only"`
 	Interface            string                 `json:"interface"`
@@ -776,7 +772,7 @@ func (c *SocketConfig) Build() (*internet.SocketConfig, error) {
 		TcpCongestion:        c.TCPCongestion,
 		TcpWindowClamp:       c.TCPWindowClamp,
 		TcpMaxSeg:            c.TCPMaxSeg,
-		TcpNoDelay:           c.TcpNoDelay,
+		Penetrate:            c.Penetrate,
 		TcpUserTimeout:       c.TCPUserTimeout,
 		V6Only:               c.V6only,
 		Interface:            c.Interface,

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
@@ -103,15 +103,15 @@ message SocketConfig {
 
   string interface = 13;
 
-  bool   v6only = 14;
+  bool v6only = 14;
 
   int32 tcp_window_clamp = 15;
 
   int32 tcp_user_timeout = 16;
 
   int32 tcp_max_seg = 17;
 
-  bool tcp_no_delay = 18;
+  bool penetrate = 18;
 
   bool tcp_mptcp = 19;
 

diff --git a/transport/internet/sockopt_darwin.go b/transport/internet/sockopt_darwin.go
@@ -136,12 +136,6 @@ func applyOutboundSocketOptions(network string, address string, fd uintptr, conf
 				return errors.New("failed to unset SO_KEEPALIVE", err)
 			}
 		}
-
-		if config.TcpNoDelay {
-			if err := unix.SetsockoptInt(int(fd), unix.IPPROTO_TCP, unix.TCP_NODELAY, 1); err != nil {
-				return errors.New("failed to set TCP_NODELAY", err)
-			}
-		}
 	}
 
 	return nil

diff --git a/transport/internet/sockopt_linux.go b/transport/internet/sockopt_linux.go
@@ -103,11 +103,6 @@ func applyOutboundSocketOptions(network string, address string, fd uintptr, conf
 			}
 		}
 
-		if config.TcpNoDelay {
-			if err := syscall.SetsockoptInt(int(fd), syscall.IPPROTO_TCP, unix.TCP_NODELAY, 1); err != nil {
-				return errors.New("failed to set TCP_NODELAY", err)
-			}
-		}
 		if len(config.CustomSockopt) > 0 {
 			for _, custom := range config.CustomSockopt {
 				var level = 0x6 // default TCP

diff --git a/transport/internet/sockopt_windows.go b/transport/internet/sockopt_windows.go
@@ -61,11 +61,6 @@ func applyOutboundSocketOptions(network string, address string, fd uintptr, conf
 				return errors.New("failed to unset SO_KEEPALIVE", err)
 			}
 		}
-		if config.TcpNoDelay {
-			if err := syscall.SetsockoptInt(syscall.Handle(fd), syscall.IPPROTO_TCP, syscall.TCP_NODELAY, 1); err != nil {
-				return errors.New("failed to set TCP_NODELAY", err)
-			}
-		}
 	}
 
 	return nil

diff --git a/transport/internet/splithttp/dialer.go b/transport/internet/splithttp/dialer.go
@@ -308,7 +308,7 @@ func Dial(ctx context.Context, dest net.Destination, streamSettings *internet.Me
 		globalDialerAccess.Lock()
 		if streamSettings.DownloadSettings == nil {
 			streamSettings.DownloadSettings = common.Must2(internet.ToMemoryStreamConfig(transportConfiguration.DownloadSettings)).(*internet.MemoryStreamConfig)
-			if streamSettings.DownloadSettings.SocketSettings == nil {
+			if streamSettings.SocketSettings != nil && streamSettings.SocketSettings.Penetrate {
 				streamSettings.DownloadSettings.SocketSettings = streamSettings.SocketSettings
 			}
 		}