Lock adding ICE candidate

kylecarbs · kylecarbs · commit 006ab678be97 · 2022-01-30T15:33:36.000Z
diff --git a/peer/conn.go b/peer/conn.go
@@ -80,8 +80,8 @@ func newWithClientOrServer(servers []webrtc.ICEServer, client bool, opts *ConnOp
 		// of this will cause a connection failure.
 		localCandidateChannel:           make(chan webrtc.ICECandidateInit, 16),
 		pendingCandidates:               make([]webrtc.ICECandidateInit, 0),
-		localSessionDescriptionChannel:  make(chan webrtc.SessionDescription, 1),
-		remoteSessionDescriptionChannel: make(chan webrtc.SessionDescription, 1),
+		localSessionDescriptionChannel:  make(chan webrtc.SessionDescription),
+		remoteSessionDescriptionChannel: make(chan webrtc.SessionDescription),
 	}
 	if client {
 		// If we're the client, we want to flip the echo and
@@ -357,10 +357,6 @@ func (c *Conn) negotiate() {
 		return
 	}
 
-	if c.offerrer {
-		c.flushPendingCandidates()
-	}
-
 	if !c.offerrer {
 		answer, err := c.rtc.CreateAnswer(&webrtc.AnswerOptions{})
 		if err != nil {
@@ -384,12 +380,8 @@ func (c *Conn) negotiate() {
 			return
 		case c.localSessionDescriptionChannel <- answer:
 		}
-
-		c.flushPendingCandidates()
 	}
-}
 
-func (c *Conn) flushPendingCandidates() {
 	c.pendingCandidatesMutex.Lock()
 	defer c.pendingCandidatesMutex.Unlock()
 	for _, pendingCandidate := range c.pendingCandidates {
@@ -421,6 +413,8 @@ func (c *Conn) AddRemoteCandidate(i webrtc.ICECandidateInit) error {
 		slog.F("hash", c.hashCandidate(i)),
 		slog.F("length", len(i.Candidate)),
 	)
+	c.closeMutex.Lock()
+	defer c.closeMutex.Unlock()
 	return c.rtc.AddICECandidate(i)
 }
 
