Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / browser / renderer_host / p2p / socket_host_tcp.cc

diff --git a/src/content/browser/renderer_host/p2p/socket_host_tcp.cc b/src/content/browser/renderer_host/p2p/socket_host_tcp.cc
index d2f2711..79f7b14 100644 (file)
--- a/src/content/browser/renderer_host/p2p/socket_host_tcp.cc
+++ b/src/content/browser/renderer_host/p2p/socket_host_tcp.cc
@@ -88,8 +88,8 @@ bool P2PSocketHostTcpBase::Init(const net::IPEndPoint& local_address,
   // socket layer will do the DNS resolve.
   if (remote_address.ip_address.address().empty()) {
     DCHECK(!remote_address.hostname.empty());
-    dest_host_port_pair = net::HostPortPair::FromString(
-        remote_address.hostname);
+    dest_host_port_pair = net::HostPortPair(remote_address.hostname,
+                                            remote_address.ip_address.port());
   } else {
     dest_host_port_pair = net::HostPortPair::FromIPEndPoint(
         remote_address.ip_address);
@@ -234,11 +234,14 @@ void P2PSocketHostTcpBase::OnOpen() {
                  << kSendSocketBufferSize;
   }
 
-  DoSendSocketCreateMsg();
+  if (!DoSendSocketCreateMsg())
+    return;
+
+  DCHECK_EQ(state_, STATE_OPEN);
   DoRead();
 }
 
-void P2PSocketHostTcpBase::DoSendSocketCreateMsg() {
+bool P2PSocketHostTcpBase::DoSendSocketCreateMsg() {
   DCHECK(socket_.get());
 
   net::IPEndPoint local_address;
@@ -247,7 +250,7 @@ void P2PSocketHostTcpBase::DoSendSocketCreateMsg() {
     LOG(ERROR) << "P2PSocketHostTcpBase::OnConnected: unable to get local"
                << " address: " << result;
     OnError();
-    return;
+    return false;
   }
 
   VLOG(1) << "Local address: " << local_address.ToString();
@@ -258,7 +261,7 @@ void P2PSocketHostTcpBase::DoSendSocketCreateMsg() {
     LOG(ERROR) << "P2PSocketHostTcpBase::OnConnected: unable to get peer"
                << " address: " << result;
     OnError();
-    return;
+    return false;
   }
   VLOG(1) << "Remote address: " << remote_address.ToString();
   if (remote_address_.ip_address.address().empty()) {
@@ -272,6 +275,7 @@ void P2PSocketHostTcpBase::DoSendSocketCreateMsg() {
   // packets sent before that by the application.
   message_sender_->Send(new P2PMsg_OnSocketCreated(
       id_, local_address, remote_address));
+  return true;
 }
 
 void P2PSocketHostTcpBase::DoRead() {