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

content/renderer/p2p/ipc_socket_factory.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/p2p/ipc_socket_factory.h"
 
 #include <algorithm>
 #include <deque>
 
 #include "base/compiler_specific.h"
@@ skipping 217 matching lines @@
   remote_address_ = remote_address;
   state_ = IS_OPENING;
 
   net::IPEndPoint local_endpoint;
   if (!jingle_glue::SocketAddressToIPEndPoint(
           local_address, &local_endpoint)) {
     return false;
   }
 
   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);
 
   return true;
 }
 
 void IpcPacketSocket::InitAcceptedTcp(
     P2PSocketClient* client,
     const rtc::SocketAddress& local_address,
     const rtc::SocketAddress& remote_address) {
@@ skipping 404 matching lines @@
 }
 
 rtc::AsyncResolverInterface*
 IpcPacketSocketFactory::CreateAsyncResolver() {
   scoped_ptr<AsyncAddressResolverImpl> resolver(
     new AsyncAddressResolverImpl(socket_dispatcher_));
   return resolver.release();
 }
 
 }  // namespace content