Skip to content

Fix data race on Agent.pendingBindingRequests #1040

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

Open
MiniNova wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −1
Open

Fix data race on Agent.pendingBindingRequests #1040

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 10 additions & 1 deletion agent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,8 @@ type Agent struct {
buf *packetio.Buffer

// LRU of outbound Binding request Transaction IDs
pendingBindingRequests []bindingRequest
pendingBindingRequestsMu sync.Mutex
pendingBindingRequests []bindingRequest

// Address rewrite (1:1) IP mapping
addressRewriteMapper *addressRewriteMapper
Expand Down Expand Up @@ -537,7 +538,9 @@ func (a *Agent) updateConnectionState(newState ConnectionState) {
a.removeUfragFromMux()
a.checklist = make([]*CandidatePair, 0)
a.pairsByID = make(map[uint64]*CandidatePair)
a.pendingBindingRequestsMu.Lock()
a.pendingBindingRequests = make([]bindingRequest, 0)
a.pendingBindingRequestsMu.Unlock()
a.setSelectedPair(nil)
a.deleteAllCandidates()
case ConnectionStateConnected:
Expand Down Expand Up @@ -777,9 +780,11 @@ func (a *Agent) consentExpired(pair *CandidatePair) bool {
func (a *Agent) revokeConsent(pair *CandidatePair) {
pair.consentRevoked = true
pair.state = CandidatePairStateFailed
a.pendingBindingRequestsMu.Lock()
a.pendingBindingRequests = slices.DeleteFunc(a.pendingBindingRequests, func(request bindingRequest) bool {
return responseSymmetric(&request, pair.Local, pair.Remote.addrPort())
})
a.pendingBindingRequestsMu.Unlock()
if pair == a.getSelectedPair() {
a.updateConnectionState(ConnectionStateFailed)
}
Expand Down Expand Up @@ -1633,6 +1638,7 @@ func (a *Agent) sendBindingRequest(msg *stun.Message, local, remote Candidate) {
if pair != nil && pair.consentRevoked {
return
}
a.pendingBindingRequestsMu.Lock()
a.invalidatePendingBindingRequests(time.Now())
a.pendingBindingRequests = append(a.pendingBindingRequests, bindingRequest{
timestamp: time.Now(),
Expand All @@ -1644,6 +1650,7 @@ func (a *Agent) sendBindingRequest(msg *stun.Message, local, remote Candidate) {
isUseCandidate: msg.Contains(stun.AttrUseCandidate),
nominationValue: nominationValue,
})
a.pendingBindingRequestsMu.Unlock()

if pair != nil {
pair.UpdateRequestSent()
Expand Down Expand Up @@ -1713,6 +1720,8 @@ func (a *Agent) invalidatePendingBindingRequests(filterTime time.Time) {
func (a *Agent) handleInboundBindingResponse(
id [stun.TransactionIDSize]byte, local Candidate, remote netip.AddrPort,
) (bool, *bindingRequest, time.Duration) {
a.pendingBindingRequestsMu.Lock()
defer a.pendingBindingRequestsMu.Unlock()
a.invalidatePendingBindingRequests(time.Now())
for i := range a.pendingBindingRequests {
if a.pendingBindingRequests[i].transactionID == id {
Expand Down
Loading