mirrors/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-05-13 15:48:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix bad type cast in dispatcher

Browse source
This commit is contained in:
世界 2023-04-24 22:43:57 +08:00
parent 837d7d885f
commit 0a099d972b
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
7 changed files with 49 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/dispatcher/default.go
View file

@ -30,10 +30,15 @@ var errSniffingTimeout = newError("timeout on sniffing")
type cachedReader struct {
sync.Mutex
reader *pipe.Reader
reader timeoutReader
cache buf.MultiBuffer
}
type timeoutReader interface {
buf.Reader
buf.TimeoutReader
}
func (r *cachedReader) Cache(b *buf.Buffer) {
mb, _ := r.reader.ReadMultiBufferTimeout(time.Millisecond * 100)
r.Lock()
@ -84,7 +89,7 @@ func (r *cachedReader) Interrupt() {
r.cache = buf.ReleaseMulti(r.cache)
}
r.Unlock()
r.reader.Interrupt()
common.Interrupt(r.reader)
}
// DefaultDispatcher is a default implementation of Dispatcher.
@ -345,7 +350,7 @@ func (d *DefaultDispatcher) DispatchLink(ctx context.Context, destination net.De
d.routedDispatch(ctx, outbound, destination)
} else {
cReader := &cachedReader{
reader: outbound.Reader.(*pipe.Reader),
reader: outbound.Reader.(timeoutReader),
}
outbound.Reader = cReader
result, err := sniffer(ctx, cReader, sniffingRequest.MetadataOnly, destination.Network)