Fix deadlock in senders closing (#211)

ionorg · Oct 5, 2020 · 28bb637 · 28bb637
1 parent 5a047f5
commit 28bb637
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/pkg/receiver.go b/pkg/receiver.go
@@ -141,8 +141,8 @@ func (w *WebRTCReceiver) SpatialLayer() uint8 {
 
 //closeSenders Close all senders from Receiver
 func (w *WebRTCReceiver) closeSenders() {
-	w.Lock()
-	defer w.Unlock()
+	w.RLock()
+	defer w.RUnlock()
 	for _, sender := range w.senders {
 		sender.Close()
 	}

diff --git a/pkg/sender.go b/pkg/sender.go
@@ -100,10 +100,6 @@ func (s *WebRTCSender) Close() {
 
 func (s *WebRTCSender) close() {
 	s.cancel()
-	// Remove sender from receiver
-	if recv := s.router.GetReceiver(0); recv != nil {
-		recv.DeleteSender(s.id)
-	}
 	if s.onCloseHandler != nil {
 		s.onCloseHandler()
 	}
@@ -118,6 +114,10 @@ func (s *WebRTCSender) receiveRTCP() {
 	for {
 		pkts, err := s.sender.ReadRTCP()
 		if err == io.ErrClosedPipe || s.ctx.Err() != nil {
+			// Remove sender from receiver
+			if recv := s.router.GetReceiver(0); recv != nil {
+				recv.DeleteSender(s.id)
+			}
 			s.Close()
 			return
 		}