mirrors/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-07-23 18:34:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge 399ec65c8c into eed05549fc

Browse source
This commit is contained in:
风扇滑翔翼 2025-07-21 09:41:47 +03:30 • committed by GitHub
commit 23923d5a75
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

17
transport/internet/udp/dispatcher.go
View file

@ -44,6 +44,10 @@ func NewDispatcher(dispatcher routing.Dispatcher, callback ResponseCallback) *Di
func (v *Dispatcher) RemoveRay() { func (v *Dispatcher) RemoveRay() {
v.Lock() v.Lock()
defer v.Unlock() defer v.Unlock()
v.removeRay()
}
func (v *Dispatcher) removeRay() {
if v.conn != nil { if v.conn != nil {
common.Interrupt(v.conn.link.Reader) common.Interrupt(v.conn.link.Reader)
common.Close(v.conn.link.Writer) common.Close(v.conn.link.Writer)
@ -62,9 +66,16 @@ func (v *Dispatcher) getInboundRay(ctx context.Context, dest net.Destination) (*
errors.LogInfo(ctx, "establishing new connection for ", dest) errors.LogInfo(ctx, "establishing new connection for ", dest)
ctx, cancel := context.WithCancel(ctx) ctx, cancel := context.WithCancel(ctx)
entry := &connEntry{}
removeRay := func() { removeRay := func() {
cancel() v.Lock()
v.RemoveRay() defer v.Unlock()
if entry == v.conn {
cancel()
v.removeRay()
} else {
errors.LogError(ctx, "removeRay trying to remove a conn that not belongs to it, canceling.")
}
} }
timer := signal.CancelAfterInactivity(ctx, removeRay, time.Minute) timer := signal.CancelAfterInactivity(ctx, removeRay, time.Minute)
@ -73,7 +84,7 @@ func (v *Dispatcher) getInboundRay(ctx context.Context, dest net.Destination) (*
return nil, errors.New("failed to dispatch request to ", dest).Base(err) return nil, errors.New("failed to dispatch request to ", dest).Base(err)
} }
entry := &connEntry{ *entry = connEntry{
link: link, link: link,
timer: timer, timer: timer,
cancel: removeRay, cancel: removeRay,