Merge branch 'master' into js_errors

JitsiConference.js

@@ -955,6 +955,13 @@ function setupListeners(conference) {
         }
     });
 
+    conference.room.addListener(XMPPEvents.ICE_RESTARTING, function () {
+        // All data channels have to be closed, before ICE restart
+        // otherwise Chrome will not trigger "opened" event for the channel
+        // established with the new bridge
+        conference.rtc.closeAllDataChannels();
+    });
+
     conference.room.addListener(XMPPEvents.REMOTE_TRACK_ADDED,
         function (data) {
             var track = conference.rtc.createRemoteTrack(data);

modules/RTC/DataChannels.js

@@ -163,14 +163,24 @@ DataChannels.prototype.onDataChannel = function (event) {
     this._dataChannels.push(dataChannel);
 };
 
+/**
+ * Closes all currently opened data channels.
+ */
+DataChannels.prototype.closeAllChannels = function () {
+    this._dataChannels.forEach(function (dc){
+        // the DC will be removed from the array on 'onclose' event
+        dc.close();
+    });
+};
+
 DataChannels.prototype.handleSelectedEndpointEvent = function (userResource) {
     this.lastSelectedEndpoint = userResource;
     this._onXXXEndpointChanged("selected", userResource);
-}
+};
 
 DataChannels.prototype.handlePinnedEndpointEvent = function (userResource) {
     this._onXXXEndpointChanged("pinnned", userResource);
-}
+};
 
 /**
  * Notifies Videobridge about a change in the value of a specific
@@ -215,7 +225,7 @@ DataChannels.prototype._onXXXEndpointChanged = function (xxx, userResource) {
             return true;
         }
     });
-}
+};
 
 DataChannels.prototype._some = function (callback, thisArg) {
     var dataChannels = this._dataChannels;
@@ -228,6 +238,6 @@ DataChannels.prototype._some = function (callback, thisArg) {
     } else {
         return false;
     }
-}
+};
 
 module.exports = DataChannels;

modules/RTC/RTC.js

@@ -387,6 +387,13 @@ RTC.isDesktopSharingEnabled = function () {
     return RTCUtils.isDesktopSharingEnabled();
 };
 
+/**
+ * Closes all currently opened data channels.
+ */
+RTC.prototype.closeAllDataChannels = function () {
+    this.dataChannels.closeAllChannels();
+};
+
 RTC.prototype.dispose = function() {
 };
 

modules/xmpp/JingleSessionPC.js

@@ -498,13 +498,29 @@ JingleSessionPC._fixAnswerRFC4145Setup = function (offer, answer) {
 JingleSessionPC.prototype.replaceTransport = function (jingleOfferElem,
                                                        success,
                                                        failure) {
-    // Set offer as RD
-    this.setOfferCycle(jingleOfferElem,
-        function () {
-            // Set local description OK, now localSDP up to date
-            this.sendTransportAccept(this.localSDP, success, failure);
-        }.bind(this),
-        failure);
+    
+    // We need to first set an offer without the 'data' section to have the SCTP
+    // stack cleaned up. After that the original offer is set to have the SCTP
+    // connection established with the new bridge.
+    this.room.eventEmitter.emit(XMPPEvents.ICE_RESTARTING);
+    var originalOffer = jingleOfferElem.clone();
+    jingleOfferElem.find(">content[name='data']").remove();
+
+    var self = this;
+    // First set an offer without the 'data' section
+    this.setOfferCycle(
+        jingleOfferElem,
+        function() {
+            // Now set the original offer(with the 'data' section)
+            self.setOfferCycle(originalOffer,
+                function () {
+                    // Set local description OK, now localSDP up to date
+                    self.sendTransportAccept(self.localSDP, success, failure);
+                },
+                failure);
+        },
+        failure
+    );
 };
 
 /**

service/xmpp/XMPPEvents.js

@@ -43,6 +43,22 @@ var XMPPEvents = {
     FOCUS_DISCONNECTED: 'xmpp.focus_disconnected',
     FOCUS_LEFT: "xmpp.focus_left",
     GRACEFUL_SHUTDOWN: "xmpp.graceful_shutdown",
+    /**
+     * Event fired when 'transport-replace' Jingle message has been received,
+     * before the new offer is set on the PeerConnection.
+     */
+    ICE_RESTARTING: "rtc.ice_restarting",
+    /* Event fired when XMPP error is returned to any request, it is meant to be
+     * used to report 'signaling' errors to CallStats
+     *
+     * {
+     *   code: {XMPP error code}
+     *   reason: {XMPP error condition}
+     *   source = request.tree()
+     *   session = {JingleSession instance}
+     * }
+     */
+    JINGLE_ERROR: 'xmpp.jingle_error',
     // Event fired when we have failed to set initial offer
     JINGLE_FATAL_ERROR: 'xmpp.jingle_fatal_error',
     // Designates an event indicating that we were kicked from the XMPP MUC.