Bug 1336507 - Part 4: Stop using a magic constant here. r?drno draft
authorByron Campen [:bwc] <docfaraday@gmail.com>
Fri, 03 Feb 2017 16:48:30 -0600
changeset 470553 a9c32665ad4d7ee8f15c4fe8a5470b3f6fcc9837
parent 470552 16fb6a0d8de36b7682b4494b8af57f3a57988fd3
child 544519 8642f66b168ec34b8b37f6bc89f5fd14dfb6944d
push id44074
push userbcampen@mozilla.com
push dateFri, 03 Feb 2017 23:02:36 +0000
reviewersdrno
bugs1336507
milestone54.0a1
Bug 1336507 - Part 4: Stop using a magic constant here. r?drno MozReview-Commit-ID: LgIUrzFFT8I
media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp
@@ -562,33 +562,35 @@ PeerConnectionConfiguration::AddIceServe
         return NS_ERROR_FAILURE;
       path.Mid(host, hostPos, hostLen);
     }
     if (port == -1)
       port = (isStuns || isTurns)? 5349 : 3478;
 
     if (isStuns || isTurns) {
       // Should we barf if transport is set to udp or something?
-      transport = "tls";
+      transport = kNrIceTransportTls;
+    }
+
+    if (transport.IsEmpty()) {
+      transport = kNrIceTransportUdp;
     }
 
     if (isTurn || isTurns) {
       NS_ConvertUTF16toUTF8 credential(aServer.mCredential.Value());
       NS_ConvertUTF16toUTF8 username(aServer.mUsername.Value());
 
       if (!addTurnServer(host.get(), port,
                          username.get(),
                          credential.get(),
-                         (transport.IsEmpty() ?
-                          kNrIceTransportUdp : transport.get()))) {
+                         transport.get())) {
         return NS_ERROR_FAILURE;
       }
     } else {
-      if (!addStunServer(host.get(), port, (transport.IsEmpty() ?
-                         kNrIceTransportUdp : transport.get()))) {
+      if (!addStunServer(host.get(), port, transport.get())) {
         return NS_ERROR_FAILURE;
       }
     }
   }
   return NS_OK;
 }
 #endif