Set data channels as closed on peer connection close

servo · Jun 29, 2020 · 820ea45 · 820ea45
1 parent 2dedcae
commit 820ea45
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/components/script/dom/rtcdatachannel.rs b/components/script/dom/rtcdatachannel.rs
@@ -133,6 +133,9 @@ impl RTCDataChannel {
     }
 
     pub fn on_error(&self, error: WebRtcError) {
+        let global = self.global();
+        let cx = global.get_cx();
+        let _ac = JSAutoRealm::new(*cx, self.reflector().get_jsobject().get());
         let init = RTCErrorInit {
             errorDetail: RTCErrorDetailType::Data_channel_failure,
             httpRequestStatusCode: None,
@@ -144,8 +147,8 @@ impl RTCDataChannel {
         let message = match error {
             WebRtcError::Backend(message) => DOMString::from(message),
         };
-        let error = RTCError::new(&self.global(), &init, message);
-        let event = RTCErrorEvent::new(&self.global(), atom!("error"), false, false, &error);
+        let error = RTCError::new(&global, &init, message);
+        let event = RTCErrorEvent::new(&global, atom!("error"), false, false, &error);
         event.upcast::<Event>().fire(self.upcast());
     }
 
@@ -299,6 +302,7 @@ impl RTCDataChannelMethods for RTCDataChannel {
         self.id
     }
 
+    // https://www.w3.org/TR/webrtc/#dom-datachannel-readystate
     fn ReadyState(&self) -> RTCDataChannelState {
         *self.ready_state.borrow()
     }

diff --git a/components/script/dom/rtcpeerconnection.rs b/components/script/dom/rtcpeerconnection.rs
@@ -44,7 +44,7 @@ use dom_struct::dom_struct;
 use servo_media::streams::registry::MediaStreamId;
 use servo_media::streams::MediaStreamType;
 use servo_media::webrtc::{
-    BundlePolicy, DataChannelEvent, DataChannelId, GatheringState, IceCandidate,
+    BundlePolicy, DataChannelEvent, DataChannelId, DataChannelState, GatheringState, IceCandidate,
     IceConnectionState, SdpType, SessionDescription, SignalingState, WebRtcController,
     WebRtcSignaller,
 };
@@ -169,7 +169,6 @@ impl WebRtcSignaller for RTCSignaller {
 
     fn close(&self) {
         // do nothing
-        // XXX(ferjm) close all data channels.
     }
 }
 
@@ -716,8 +715,13 @@ impl RTCPeerConnectionMethods for RTCPeerConnection {
         // Step 5 handled by backend
         self.controller.borrow_mut().as_ref().unwrap().quit();
 
-        // Step 6-10
-        // (no current support for data channels, transports, etc)
+        // Step 6
+        for (_, val) in self.data_channels.borrow().iter() {
+            val.on_state_change(DataChannelState::Closed);
+        }
+
+        // Step 7-10
+        // (no current support for transports, etc)
 
         // Step 11
         self.ice_connection_state.set(RTCIceConnectionState::Closed);