commit bb25256775be6946e695d94f40e9615039261b87
author vikasmarwaha@webrtc.org <vikasmarwaha@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Jun 25 14:52:51 2013 +0000
committer vikasmarwaha@webrtc.org <vikasmarwaha@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Jun 25 14:52:51 2013 +0000
tree 56cafc909cbe7f0a78adfb2562115e798baeb71d
parent 3348ae2b97f7f14de7dcf911bfd3e8c571d7174a

Added changes in apprtc demo to ignore turn address through query string for FF. Also made sure that the iceServers array doesnot include transport parameter in turn url for FF. Finally removed turn: from the turn_url when creating iceservers for pre-M28 chrome.

R=dutton@google.com, juberti@google.com

Review URL: https://webrtc-codereview.appspot.com/1627006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4259 4adac7df-926f-26a2-2b94-8c16560cd09d

samples/js/base/adapter.js

diff --git a/samples/js/base/adapter.js b/samples/js/base/adapter.js
index 62978f2..09352b8 100644
--- a/samples/js/base/adapter.js
+++ b/samples/js/base/adapter.js
@@ -18,6 +18,9 @@
 
   webrtcDetectedBrowser = "firefox";
 
+  webrtcDetectedVersion =
+                  parseInt(navigator.userAgent.match(/Firefox\/([0-9]+)\./)[1]);
+
   // The RTCPeerConnection object.
   RTCPeerConnection = mozRTCPeerConnection;
 
@@ -31,11 +34,23 @@
   // Code from Adam Barth.
   getUserMedia = navigator.mozGetUserMedia.bind(navigator);
 
-  // Creates Turn Uri with new turn format.
-  createIceServer = function(turn_url, username, password) {
-    var iceServer = { 'url': turn_url,
-                      'credential': password,
-                      'username': username };
+  // Creates iceServer from the url for FF.
+  createIceServer = function(url, username, password) {
+    var iceServer = null;
+    var url_parts = url.split(':');
+    if (url_parts[0].indexOf('stun') === 0) {
+      // Create iceServer with stun url.
+      iceServer = { 'url': url };
+    } else if (url_parts[0].indexOf('turn') === 0 &&
+               (url.indexOf('transport=udp') !== -1 ||
+                url.indexOf('?transport') === -1)) {
+      // Create iceServer with turn url.
+      // Ignore the transport parameter from TURN url.
+      var turn_url_parts = url.split("?");
+      iceServer = { 'url': turn_url_parts[0],
+                    'credential': password,
+                    'username': username };
+    }
     return iceServer;
   };
 
@@ -67,21 +82,28 @@
   webrtcDetectedVersion =
              parseInt(navigator.userAgent.match(/Chrom(e|ium)\/([0-9]+)\./)[2]);
 
-  // For pre-M28 chrome versions use old turn format, else use the new format.
-  if (webrtcDetectedVersion < 28) {
-    createIceServer = function(turn_url, username, password) {
-      var iceServer = { 'url': 'turn:' + username + '@' + turn_url,
-                        'credential': password };
-      return iceServer;
-    };
-  } else {
-    createIceServer = function(turn_url, username, password) {
-      var iceServer = { 'url': turn_url,
-                        'credential': password,
-                        'username': username };
-      return iceServer;
-    };
-  }
+  // Creates iceServer from the url for Chrome.
+  createIceServer = function(url, username, password) {
+    var iceServer = null;
+    var url_parts = url.split(':');
+    if (url_parts[0].indexOf('stun') === 0) {
+      // Create iceServer with stun url.
+      iceServer = { 'url': url };
+    } else if (url_parts[0].indexOf('turn') === 0) {
+      if (webrtcDetectedVersion < 28) {
+        // For pre-M28 chrome versions use old TURN format.
+        var url_turn_parts = url.split("turn:");
+        iceServer = { 'url': 'turn:' + username + '@' + url_turn_parts[1],
+                      'credential': password };
+      } else {
+        // For Chrome M28 & above use new TURN format.
+        iceServer = { 'url': url,
+                      'credential': password,
+                      'username': username };
+      }
+    }
+    return iceServer;
+  };
 
   // The RTCPeerConnection object.
   RTCPeerConnection = webkitRTCPeerConnection;