Merge pull request #525 from fippo/more-candidate-gathering-fixes

candidate gathering demo: use urls everywhere
webrtc · Jun 13, 2015 · 932c1eb · 932c1eb
2 parents 302f9d0 + 789f01f
commit 932c1eb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/content/peerconnection/trickle-ice/index.html b/src/content/peerconnection/trickle-ice/index.html
@@ -50,7 +50,7 @@ <h1><a href="//webrtc.github.io/samples/" title="WebRTC samples homepage">WebRTC
       <h2>ICE servers</h2>
 
       <select id="servers" size="4">
-        <option value="{&quot;url&quot;:&quot;stun:stun.l.google.com:19302&quot;}" ondblclick="selectServer(event);">stun:stun.l.google.com:19302</option>
+        <option value="{&quot;urls&quot;:[&quot;stun:stun.l.google.com:19302&quot;]}" ondblclick="selectServer(event);">stun:stun.l.google.com:19302</option>
       </select>
 
       <div>

diff --git a/src/content/peerconnection/trickle-ice/js/main.js b/src/content/peerconnection/trickle-ice/js/main.js
@@ -30,7 +30,7 @@ var candidates;
 function selectServer(event) {
   var option = event.target;
   var value = JSON.parse(option.value);
-  urlInput.value = value.url;
+  urlInput.value = value.urls[0];
   usernameInput.value = value.username || '';
   passwordInput.value = value.credential || '';
 }
@@ -179,8 +179,8 @@ function getFinalResult() {
     //
     // This only works for TURN/UDP since we do not get
     // srflx candidates from TURN/TCP.
-    if (server.url.indexOf('turn:') === 0 &&
-        server.url.indexOf('?transport=tcp') === -1) {
+    if (server.urls[0].indexOf('turn:') === 0 &&
+        server.urls[0].indexOf('?transport=tcp') === -1) {
       if (types.indexOf('relay') === -1) {
         if (types.indexOf('srflx') > -1) {
           // a binding response but no relay candidate suggests auth failure.