Fix the way stun servers configuration is generated.

versatica · Feb 3, 2013 · 72424bd · 72424bd
1 parent ef6c3b0
commit 72424bd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/MediaSession.js b/src/MediaSession.js
@@ -107,19 +107,24 @@ JsSIP.MediaSession.prototype = {
   * @param {Function} onSuccess Fired when there are no more ICE candidates
   */
   start: function(onSuccess) {
-    var idx, server,
+    var idx, server, scheme, url,
       session = this,
       sent = false,
       servers = [];
 
     for (idx in this.session.ua.configuration.stun_servers) {
-      server = this.session.ua.configuration.stun_server[idx];
+      server = this.session.ua.configuration.stun_servers[idx];
       servers.push({'url': server});
     }
 
     for (idx in this.session.ua.configuration.turn_servers) {
       server = this.session.ua.configuration.turn_servers[idx];
-      servers.push({'url': server.username +'@'+ server.server, 'credential': server.password});
+      url = server.server;
+      scheme = url.substr(0, url.indexOf(':'));
+      servers.push({
+        'url': scheme + ':' + server.username + '@' + url.substr(scheme.length+1),
+        'credential': server.password
+      });
     }
 
     this.peerConnection = new webkitRTCPeerConnection({"iceServers": servers});

diff --git a/src/UA.js b/src/UA.js
@@ -665,11 +665,11 @@ JsSIP.UA.prototype.loadConfig = function(configuration) {
     }
   }
 
-  if (!(configuration.stun_servers instanceof Array)){
+  if (configuration.stun_servers && !(configuration.stun_servers instanceof Array)){
     configuration.stun_servers = [configuration.stun_servers];
   }
 
-  if (!(configuration.turn_servers instanceof Array)){
+  if (configuration.turn_servers && !(configuration.turn_servers instanceof Array)){
     configuration.turn_servers = [configuration.turn_servers];
   }