From 2be529f5903b3f457c9ce0408addacc1f856d0e9 Mon Sep 17 00:00:00 2001 From: chn Date: Mon, 24 Jun 2024 19:09:22 +0800 Subject: [PATCH] services.xray: fix --- modules/services/xray/disable-splice.patch | 24 ++++++++++------------ 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/modules/services/xray/disable-splice.patch b/modules/services/xray/disable-splice.patch index ecb5fcf1..ab102af0 100644 --- a/modules/services/xray/disable-splice.patch +++ b/modules/services/xray/disable-splice.patch @@ -1,16 +1,14 @@ -diff --git a/disable-splice.patch b/disable-splice.patch -new file mode 100644 -index 0000000..e69de29 diff --git a/proxy/proxy.go b/proxy/proxy.go -index 6a5a179..ca71241 100644 +index db92051..3c902ae 100644 --- a/proxy/proxy.go +++ b/proxy/proxy.go -@@ -474,7 +474,7 @@ func CopyRawConnIfExist(ctx context.Context, readerConn net.Conn, writerConn net - readerConn, readCounter, _ := UnwrapRawConn(readerConn) - writerConn, _, writeCounter := UnwrapRawConn(writerConn) - reader := buf.NewReader(readerConn) -- if inbound := session.InboundFromContext(ctx); inbound != nil { -+ if inbound := session.InboundFromContext(ctx); false { - if tc, ok := writerConn.(*net.TCPConn); ok && readerConn != nil && writerConn != nil && (runtime.GOOS == "linux" || runtime.GOOS == "android") { - for inbound.CanSpliceCopy != 3 { - if inbound.CanSpliceCopy == 1 { +@@ -504,7 +504,8 @@ func CopyRawConnIfExist(ctx context.Context, readerConn net.Conn, writerConn net + splice = false + } + } +- if splice { ++ _ := splice ++ if false { + newError("CopyRawConn splice").WriteToLog(session.ExportIDToError(ctx)) + statWriter, _ := writer.(*dispatcher.SizeStatWriter) + //runtime.Gosched() // necessary