fix: xray内核开启splice导致限速失效

This commit is contained in:
wyx2685
2025-09-19 00:44:21 +09:00
parent 65f2de55ea
commit 9483526f3c
2 changed files with 14 additions and 53 deletions

View File

@@ -2,7 +2,6 @@ package dispatcher
import (
sync "sync"
"time"
"github.com/xtls/xray-core/common"
"github.com/xtls/xray-core/common/buf"
@@ -22,56 +21,28 @@ func (w *ManagedWriter) Close() error {
return common.Close(w.writer)
}
type ManagedReader struct {
reader buf.TimeoutReader
manager *LinkManager
}
func (r *ManagedReader) ReadMultiBuffer() (buf.MultiBuffer, error) {
return r.reader.ReadMultiBuffer()
}
func (r *ManagedReader) ReadMultiBufferTimeout(t time.Duration) (buf.MultiBuffer, error) {
return r.reader.ReadMultiBufferTimeout(t)
}
func (r *ManagedReader) Interrupt() {
r.manager.RemoveReader(r)
common.Interrupt(r.reader)
}
type LinkManager struct {
writers map[*ManagedWriter]struct{}
readers map[*ManagedReader]struct{}
mu sync.Mutex
links map[*ManagedWriter]buf.Reader
mu sync.Mutex
}
func (m *LinkManager) AddLink(writer *ManagedWriter, reader *ManagedReader) {
func (m *LinkManager) AddLink(writer *ManagedWriter, reader buf.Reader) {
m.mu.Lock()
defer m.mu.Unlock()
m.writers[writer] = struct{}{}
m.readers[reader] = struct{}{}
m.links[writer] = reader
}
func (m *LinkManager) RemoveWriter(writer *ManagedWriter) {
m.mu.Lock()
defer m.mu.Unlock()
delete(m.writers, writer)
}
func (m *LinkManager) RemoveReader(reader *ManagedReader) {
m.mu.Lock()
defer m.mu.Unlock()
delete(m.readers, reader)
delete(m.links, writer)
}
func (m *LinkManager) CloseAll() {
m.mu.Lock()
defer m.mu.Unlock()
for w := range m.writers {
for w, r := range m.links {
common.Close(w)
}
for r := range m.readers {
common.Interrupt(r)
}
}