hesoyam/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2026-06-27 23:43:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix occasional SSL protocol error in XTLS Vision by deferring direct copy when rawInput has pending data

Browse Source 
Co-authored-by: RPRX <63339210+RPRX@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-01-11 10:33:21 +00:00
parent e9774fc237
commit bdfd1d27b5
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proxy/proxy.go
+11 -3
View File
@@ -224,7 +224,8 @@ func (w *VisionReader) ReadMultiBuffer() (buf.MultiBuffer, error) {
switchToDirectCopy = &w.trafficState.Outbound.DownlinkReaderDirectCopy switchToDirectCopy = &w.trafficState.Outbound.DownlinkReaderDirectCopy
} }
if *switchToDirectCopy { if *switchToDirectCopy && w.input == nil {
// Already switched to direct copy mode
if w.directReadCounter != nil { if w.directReadCounter != nil {
w.directReadCounter.Add(int64(buffer.Len())) w.directReadCounter.Add(int64(buffer.Len()))
} }
@@ -257,11 +258,18 @@ func (w *VisionReader) ReadMultiBuffer() (buf.MultiBuffer, error) {
if *switchToDirectCopy { if *switchToDirectCopy {
// XTLS Vision processes TLS-like conn's input and rawInput // XTLS Vision processes TLS-like conn's input and rawInput
// input contains decrypted application data - safe to merge
if inputBuffer, err := buf.ReadFrom(w.input); err == nil && !inputBuffer.IsEmpty() { if inputBuffer, err := buf.ReadFrom(w.input); err == nil && !inputBuffer.IsEmpty() {
buffer, _ = buf.MergeMulti(buffer, inputBuffer) buffer, _ = buf.MergeMulti(buffer, inputBuffer)
} }
if rawInputBuffer, err := buf.ReadFrom(w.rawInput); err == nil && !rawInputBuffer.IsEmpty() { // rawInput may contain encrypted bytes for the next TLS record
buffer, _ = buf.MergeMulti(buffer, rawInputBuffer) // If rawInput is not empty, we should NOT switch to direct mode yet
// because those bytes need to be processed by the TLS layer first
if w.rawInput != nil && w.rawInput.Len() > 0 {
// rawInput has pending data - defer direct copy to next read
// Keep *switchToDirectCopy as true so we retry on next read
// This ensures we don't mix encrypted bytes with application data
return buffer, err
} }
*w.input = bytes.Reader{} // release memory *w.input = bytes.Reader{} // release memory
w.input = nil w.input = nil