Removes fabricSetupFailed and adds iceConnectionFailure for callstats.

JitsiConference.js

@@ -1273,9 +1273,11 @@ function setupListeners(conference) {
                     session, conference.settings);
             });
 
-        conference.room.addListener(XMPPEvents.CONFERENCE_SETUP_FAILED,
-            function () {
-                conference.statistics.sendSetupFailedEvent();
+        conference.room.addListener(XMPPEvents.CONNECTION_ICE_FAILED,
+            function (pc) {
+                conference.statistics.sendIceConnectionFailedEvent(pc);
+                conference.room.eventEmitter.emit(
+                    XMPPEvents.CONFERENCE_SETUP_FAILED);
             });
 
         conference.rtc.addListener(RTCEvents.TRACK_ATTACHED,

modules/statistics/CallStats.js

@@ -15,6 +15,7 @@ var wrtcFuncNames = {
     setRemoteDescription: "setRemoteDescription",
     addIceCandidate:      "addIceCandidate",
     getUserMedia:         "getUserMedia",
+    iceConnectionFailure: "iceConnectionFailure",
     signalingError:       "signalingError"
 };
 
@@ -23,7 +24,6 @@ var wrtcFuncNames = {
  * @see http://www.callstats.io/api/#enumeration-of-fabricevent
  */
 var fabricEvent = {
-    fabricSetupFailed:"fabricSetupFailed",
     fabricHold:"fabricHold",
     fabricResume:"fabricResume",
     audioMute:"audioMute",
@@ -263,14 +263,13 @@ CallStats.prototype.sendTerminateEvent = _try_catch(function () {
 });
 
 /**
- * Notifies CallStats for connection setup errors
+ * Notifies CallStats for ice connection failed
+ * @param {RTCPeerConnection} pc connection on which failure occured.
+ * @param {CallStats} cs callstats instance related to the error (optional)
  */
-CallStats.prototype.sendSetupFailedEvent = _try_catch(function () {
-    if(!callStats) {
-        return;
-    }
-    callStats.sendFabricEvent(this.peerconnection,
-        callStats.fabricEvent.fabricSetupFailed, this.confID);
+CallStats.prototype.sendIceConnectionFailedEvent = _try_catch(function (pc, cs){
+    CallStats._reportError.call(
+        cs, wrtcFuncNames.iceConnectionFailure, null, pc);
 });
 
 /**

modules/statistics/statistics.js

@@ -176,11 +176,12 @@ Statistics.prototype.isCallstatsEnabled = function () {
 };
 
 /**
- * Notifies CallStats for connection setup errors
+ * Notifies CallStats for ice connection failed
+ * @param {RTCPeerConnection} pc connection on which failure occured.
  */
-Statistics.prototype.sendSetupFailedEvent = function () {
+Statistics.prototype.sendIceConnectionFailedEvent = function (pc) {
     if(this.callStatsIntegrationEnabled && this.callstats)
-        this.callstats.sendSetupFailedEvent();
+        this.callstats.sendIceConnectionFailedEvent(pc, this.callstats);
 };
 
 /**

modules/xmpp/JingleSessionPC.js

@@ -159,7 +159,8 @@ JingleSessionPC.prototype.doInitialize = function () {
                     self.room.eventEmitter.emit(XMPPEvents.CONNECTION_INTERRUPTED);
                 break;
             case 'failed':
-                self.room.eventEmitter.emit(XMPPEvents.CONFERENCE_SETUP_FAILED);
+                self.room.eventEmitter.emit(XMPPEvents.CONNECTION_ICE_FAILED,
+                    self.peerconnection);
                 break;
         }
     };

service/xmpp/XMPPEvents.js

@@ -22,6 +22,9 @@ var XMPPEvents = {
     // Designates an event indicating that the media (ICE) connection was
     // restored. This should go to the RTC module.
     CONNECTION_RESTORED: "xmpp.connection.restored",
+    // Designates an event indicating that the media (ICE) connection failed.
+    // This should go to the RTC module.
+    CONNECTION_ICE_FAILED: "xmpp.connection.ice.failed",
     // TODO: only used in a hack, should probably be removed.
     CREATE_ANSWER_ERROR: 'xmpp.create_answer_error',
     /**
@@ -103,7 +106,7 @@ var XMPPEvents = {
      * Event fired when we remote track is added to the conference.
      * The following structure is passed as an argument:
      * {
-     *   stream: the WebRTC MediaStream instance 
+     *   stream: the WebRTC MediaStream instance
      *   track: the WebRTC MediaStreamTrack
      *   mediaType: the MediaType instance
      *   owner: the MUC JID of the stream owner
@@ -113,7 +116,7 @@ var XMPPEvents = {
     REMOTE_TRACK_ADDED: "xmpp.remote_track_added",
     /**
      * Indicates that the remote track has been removed from the conference.
-     * 1st event argument is the ID of the parent WebRTC stream to which 
+     * 1st event argument is the ID of the parent WebRTC stream to which
      * the track being removed belongs to.
      * 2nd event argument is the ID of the removed track.
      */