Merge pull request #290 from jitsi/fix_disable_tcp

Remove 'ssltcp' candidates when 'webrtcIceTcpDisable' = true

modules/xmpp/JingleSessionPC.js

@@ -102,7 +102,7 @@ JingleSessionPC.prototype.doInitialize = function () {
             var protocol = candidate.protocol;
             if (typeof protocol === 'string') {
                 protocol = protocol.toLowerCase();
-                if (protocol == 'tcp') {
+                if (protocol === 'tcp' || protocol ==='ssltcp') {
                     if (self.webrtcIceTcpDisable)
                         return;
                 } else if (protocol == 'udp') {

modules/xmpp/SDP.js

@@ -399,7 +399,8 @@ SDP.prototype.transportToJingle = function (mediaindex, elem) {
                 var protocol = (candidate &&
                         typeof candidate.protocol === 'string')
                     ? candidate.protocol.toLowerCase() : '';
-                if ((self.removeTcpCandidates && protocol === 'tcp') ||
+                if ((self.removeTcpCandidates
+                        && (protocol === 'tcp' || protocol === 'ssltcp')) ||
                     (self.removeUdpCandidates && protocol === 'udp')) {
                     return;
                 }
@@ -606,7 +607,8 @@ SDP.prototype.jingle2media = function (content) {
         var protocol = this.getAttribute('protocol');
         protocol = (typeof protocol === 'string') ? protocol.toLowerCase(): '';
 
-        if ((self.removeTcpCandidates && protocol === 'tcp') ||
+        if ((self.removeTcpCandidates
+                && (protocol === 'tcp' || protocol === 'ssltcp')) ||
             (self.removeUdpCandidates && protocol === 'udp')) {
             return;
         } else  if (self.failICE) {