zishuo/webrtc
1
0
Fork 0
mirror of https://github.com/pion/webrtc.git synced 2025-10-29 01:42:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix: onnegotiationneeded handler race

Browse Source 
Setting and calling the handler can race
This commit is contained in:
tarrencev
2020-10-30 16:32:53 -04:00
committed by Tarrence van As
parent 670edf752a
commit 60db5090fc
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
peerconnection.go
View File

@@ -12,6 +12,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"sync" "sync"
"sync/atomic"
"time" "time"
"github.com/pion/ice/v2" "github.com/pion/ice/v2"
@@ -66,7 +67,7 @@ type PeerConnection struct {
onConnectionStateChangeHandler func(PeerConnectionState) onConnectionStateChangeHandler func(PeerConnectionState)
onTrackHandler func(*Track, *RTPReceiver) onTrackHandler func(*Track, *RTPReceiver)
onDataChannelHandler func(*DataChannel) onDataChannelHandler func(*DataChannel)
onNegotiationNeededHandler func() onNegotiationNeededHandler atomic.Value // func()
iceGatherer *ICEGatherer iceGatherer *ICEGatherer
iceTransport *ICETransport iceTransport *ICETransport
@@ -248,9 +249,7 @@ func (pc *PeerConnection) OnDataChannel(f func(*DataChannel)) {
// OnNegotiationNeeded sets an event handler which is invoked when // OnNegotiationNeeded sets an event handler which is invoked when
// a change has occurred which requires session negotiation // a change has occurred which requires session negotiation
func (pc *PeerConnection) OnNegotiationNeeded(f func()) { func (pc *PeerConnection) OnNegotiationNeeded(f func()) {
pc.mu.Lock() pc.onNegotiationNeededHandler.Store(f)
defer pc.mu.Unlock()
pc.onNegotiationNeededHandler = f
} }
func (pc *PeerConnection) onNegotiationNeeded() { func (pc *PeerConnection) onNegotiationNeeded() {
@@ -312,8 +311,8 @@ func (pc *PeerConnection) negotiationNeededOp() {
pc.isNegotiationNeeded.set(true) pc.isNegotiationNeeded.set(true)
// Step 2.7 // Step 2.7
if pc.onNegotiationNeededHandler != nil { if handler, ok := pc.onNegotiationNeededHandler.Load().(func()); ok && handler != nil {
pc.onNegotiationNeededHandler() handler()
} }
} }