From dc023ae13a2ed16c260ab566f9086cc56e8685bd Mon Sep 17 00:00:00 2001
From: Haruue <i@haruue.moe>
Date: Fri, 4 Oct 2024 16:33:41 +0800
Subject: [PATCH] fix: udpSessionManager.mutex reentrant by cleanup

---
 core/server/udp.go | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/server/udp.go b/core/server/udp.go
index 3d7cd71..ec470fc 100644
--- a/core/server/udp.go
+++ b/core/server/udp.go
@@ -262,16 +262,21 @@ func (m *udpSessionManager) idleCleanupLoop(stopCh <-chan struct{}) {
 
 func (m *udpSessionManager) cleanup(idleOnly bool) {
 	// We use RLock here as we are only scanning the map, not deleting from it.
-	m.mutex.RLock()
-	defer m.mutex.RUnlock()
+	timeoutEntry := make([]*udpSessionEntry, 0, len(m.m))
 
+	m.mutex.RLock()
 	now := time.Now()
 	for _, entry := range m.m {
 		if !idleOnly || now.Sub(entry.Last.Get()) > m.idleTimeout {
-			entry.MarkTimeout()
-			// Entry will be removed by its ExitFunc.
+			timeoutEntry = append(timeoutEntry, entry)
 		}
 	}
+	m.mutex.RUnlock()
+
+	for _, entry := range timeoutEntry {
+		entry.MarkTimeout()
+		// Entry will be removed by its ExitFunc.
+	}
 }
 
 func (m *udpSessionManager) feed(msg *protocol.UDPMessage) {