Fix the hostname used to setup a TURN/TSL connection.

BUG=https://code.google.com/p/webrtc/issues/detail?id=3601

Review URL: https://codereview.chromium.org/466843002

Cr-Commit-Position: refs/heads/master@{#289972}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289972 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 7 deletions

diff --git a/content/renderer/p2p/ipc_socket_factory.cc b/content/renderer/p2p/ipc_socket_factory.cc
index 62428ad..3055016 100644
--- a/content/renderer/p2p/ipc_socket_factory.cc
+++ b/content/renderer/p2p/ipc_socket_factory.cc
@@ -235,18 +235,24 @@ bool IpcPacketSocket::Init(P2PSocketType type,
   }
 
   net::IPEndPoint remote_endpoint;
-  if (!remote_address.IsNil() && !jingle_glue::SocketAddressToIPEndPoint(
-      remote_address, &remote_endpoint) && !IsTcpClientSocket(type_)) {
-    // Non TCP sockets must have a resolved remote address.
-    return false;
+  if (!remote_address.IsNil()) {
+    DCHECK(IsTcpClientSocket(type_));
+
+    if (remote_address.IsUnresolvedIP()) {
+      remote_endpoint =
+          net::IPEndPoint(net::IPAddressNumber(), remote_address.port());
+    } else {
+      if (!jingle_glue::SocketAddressToIPEndPoint(remote_address,
+                                                  &remote_endpoint)) {
+        return false;
+      }
+    }
   }
 
   // We need to send both resolved and unresolved address in Init. Unresolved
   // address will be used in case of TLS for certificate hostname matching.
   // Certificate will be tied to domain name not to IP address.
-  std::string remote_hostname = remote_address.hostname() + ":" +
-      remote_address.PortAsString();
-  P2PHostAndIPEndPoint remote_info(remote_hostname, remote_endpoint);
+  P2PHostAndIPEndPoint remote_info(remote_address.hostname(), remote_endpoint);
 
   client->Init(type, local_endpoint, remote_info, this);