Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: Remove udp connection twice(#1297) #1305

Merged
merged 2 commits into from
Sep 30, 2021
Merged

Fix: Remove udp connection twice(#1297) #1305

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
84da857
Fix: Remove udp conn twice
Ovear Sep 27, 2021
c6a4e3a
Remove unnecessary log.
Ovear Sep 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions app/proxyman/inbound/worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,11 @@ type udpConn struct {
done *done.Instance
uplink stats.Counter
downlink stats.Counter
inactive bool
}

func (c *udpConn) setInactive() {
c.inactive = true
}

func (c *udpConn) updateActivity() {
Expand Down Expand Up @@ -315,7 +320,11 @@ func (w *udpWorker) callback(b *buf.Buffer, source net.Destination, originalDest
newError("connection ends").Base(err).WriteToLog(session.ExportIDToError(ctx))
}
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)
}
}()
}
}
Expand Down Expand Up @@ -344,7 +353,10 @@ func (w *udpWorker) clean() error {

for addr, conn := range w.activeConn {
if nowSec-atomic.LoadInt64(&conn.lastActivityTime) > 8 { // TODO Timeout too small
delete(w.activeConn, addr)
if !conn.inactive {
conn.setInactive()
delete(w.activeConn, addr)
}
conn.Close()
}
}
Expand Down