Handle unresolved remote hostname for TCP sockets.

content/browser/renderer_host/p2p/socket_host_tcp.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/browser/renderer_host/p2p/socket_host_tcp.h"
 
 #include "base/sys_byteorder.h"
 #include "content/common/p2p_messages.h"
 #include "ipc/ipc_sender.h"
 #include "jingle/glue/fake_ssl_client_socket.h"
@@ skipping 67 matching lines @@
 
 bool P2PSocketHostTcpBase::Init(const net::IPEndPoint& local_address,
                                 const P2PHostAndIPEndPoint& remote_address) {
   DCHECK_EQ(state_, STATE_UNINITIALIZED);
 
   remote_address_ = remote_address;
   state_ = STATE_CONNECTING;
 
   net::HostPortPair dest_host_port_pair =
       net::HostPortPair::FromIPEndPoint(remote_address.ip_address);
+  // If there is no resolved address, let's try with domain name, assuming
+  // socket layer will do the DNS resolve.
+  if (remote_address.ip_address.address().empty()) {
+    dest_host_port_pair = net::HostPortPair(
+      remote_address.hostname, remote_address.ip_address.port());

[Sergey Ulanov, 2014/07/03 03:31:06]

DCHECK that hostname is not empty?

[Mallinath (Gone from Chromium), 2014/07/07 17:56:44]

Done.

+  }
+
   // TODO(mallinath) - We are ignoring local_address altogether. We should
   // find a way to inject this into ProxyResolvingClientSocket. This could be
   // a problem on multi-homed host.
 
   // The default SSLConfig is good enough for us for now.
   const net::SSLConfig ssl_config;
   socket_.reset(new jingle_glue::ProxyResolvingClientSocket(
                     NULL,     // Default socket pool provided by the net::Proxy.
                     url_context_,
                     ssl_config,
@@ skipping 119 matching lines @@
                  << kSendSocketBufferSize;
   }
 
   DoSendSocketCreateMsg();
   DoRead();
 }
 
 void P2PSocketHostTcpBase::DoSendSocketCreateMsg() {
   DCHECK(socket_.get());
 
-  net::IPEndPoint address;
-  int result = socket_->GetLocalAddress(&address);
+  net::IPEndPoint local_address;
+  int result = socket_->GetLocalAddress(&local_address);
   if (result < 0) {
     LOG(ERROR) << "P2PSocketHostTcpBase::OnConnected: unable to get local"
                << " address: " << result;
     OnError();
     return;
   }
 
-  VLOG(1) << "Local address: " << address.ToString();
+  VLOG(1) << "Local address: " << local_address.ToString();
+
+  net::IPEndPoint remote_address;
+  result = socket_->GetPeerAddress(&remote_address);
+  if (result < 0) {
+    LOG(ERROR) << "P2PSocketHostTcpBase::OnConnected: unable to get peer"
+               << " address: " << result;
+    OnError();
+    return;
+  }
+  VLOG(1) << "Remote address: " << remote_address.ToString();
+  if (remote_address_.ip_address.address().empty()) {
+    // Save |remote_address| if address is empty.
+    remote_address_.ip_address = remote_address;
+  }
 
   // If we are not doing TLS, we are ready to send data now.
   // In case of TLS SignalConnect will be sent only after TLS handshake is
   // successfull. So no buffering will be done at socket handlers if any
   // packets sent before that by the application.
-  message_sender_->Send(new P2PMsg_OnSocketCreated(id_, address));
+  message_sender_->Send(new P2PMsg_OnSocketCreated(
+      id_, local_address, remote_address));
 }
 
 void P2PSocketHostTcpBase::DoRead() {
   int result;
   do {
     if (!read_buffer_.get()) {
       read_buffer_ = new net::GrowableIOBuffer();
       read_buffer_->SetCapacity(kReadBufferSize);
     } else if (read_buffer_->RemainingCapacity() < kReadBufferSize) {
       // Make sure that we always have at least kReadBufferSize of
@@ skipping 316 matching lines @@
   } else {
     packet_size += kTurnChannelDataHeaderSize;
     // Calculate any padding if present.
     if (packet_size % 4)
       *pad_bytes = 4 - packet_size % 4;
   }
   return packet_size;
 }
 
 }  // namespace content