mirrors/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2024-11-27 01:13:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Remove udp connection twice

Browse Source
This commit is contained in:
Ovear 2021-09-29 22:31:59 +08:00 committed by 世界
parent 27224868ab
commit 3c7189a3e7
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/proxyman/inbound/worker.go
View File

@ -161,6 +161,11 @@ type udpConn struct {
done *done.Instance done *done.Instance
uplink stats.Counter uplink stats.Counter
downlink stats.Counter downlink stats.Counter
inactive bool
}
func (c *udpConn) setInactive() {
c.inactive = true
} }
func (c *udpConn) updateActivity() { func (c *udpConn) updateActivity() {
@ -328,7 +333,11 @@ func (w *udpWorker) callback(b *buf.Buffer, source net.Destination, originalDest
newError("connection ends").Base(err).WriteToLog(session.ExportIDToError(ctx)) newError("connection ends").Base(err).WriteToLog(session.ExportIDToError(ctx))
} }
conn.Close() conn.Close()
w.removeConn(id) // conn not removed by checker TODO may be lock worker here is better
if !conn.inactive {
conn.setInactive()
w.removeConn(id)
}
}() }()
} }
} }
@ -356,8 +365,11 @@ func (w *udpWorker) clean() error {
} }
for addr, conn := range w.activeConn { for addr, conn := range w.activeConn {
if nowSec-atomic.LoadInt64(&conn.lastActivityTime) > 300 { if nowSec-atomic.LoadInt64(&conn.lastActivityTime) > 5*60 { // TODO Timeout too small
delete(w.activeConn, addr) if !conn.inactive {
conn.setInactive()
delete(w.activeConn, addr)
}
conn.Close() conn.Close()
} }
} }