PPB_TCPSocket: add support for TCP server socket operations.

content/browser/renderer_host/pepper/content_browser_pepper_host_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/browser/renderer_host/pepper/content_browser_pepper_host_factory.h"
 
 #include "content/browser/renderer_host/pepper/browser_ppapi_host_impl.h"
 #include "content/browser/renderer_host/pepper/pepper_browser_font_singleton_host.h"
 #include "content/browser/renderer_host/pepper/pepper_file_ref_host.h"
 #include "content/browser/renderer_host/pepper/pepper_file_system_browser_host.h"
 #include "content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h"
 #include "content/browser/renderer_host/pepper/pepper_gamepad_host.h"
 #include "content/browser/renderer_host/pepper/pepper_host_resolver_message_filter.h"
 #include "content/browser/renderer_host/pepper/pepper_network_proxy_host.h"
 #include "content/browser/renderer_host/pepper/pepper_print_settings_manager.h"
 #include "content/browser/renderer_host/pepper/pepper_printing_host.h"
 #include "content/browser/renderer_host/pepper/pepper_tcp_server_socket_message_filter.h"
 #include "content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.h"
 #include "content/browser/renderer_host/pepper/pepper_truetype_font_list_host.h"
 #include "content/browser/renderer_host/pepper/pepper_udp_socket_message_filter.h"
-#include "net/socket/stream_socket.h"
+#include "ppapi/c/ppb_net_address.h"
 #include "ppapi/host/message_filter_host.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ppapi/host/resource_host.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/ppapi_permissions.h"
 
 using ppapi::host::MessageFilterHost;
 using ppapi::host::ResourceHost;
 using ppapi::host::ResourceMessageFilter;
 using ppapi::UnpackMessage;
@@ skipping 65 matching lines @@
       std::string internal_path;
       if (!UnpackMessage<PpapiHostMsg_FileRef_CreateInternal>(
           message, &file_system, &internal_path)) {
         NOTREACHED();
         return scoped_ptr<ResourceHost>();
       }
       return scoped_ptr<ResourceHost>(new PepperFileRefHost(
           host_, instance, params.pp_resource(), file_system, internal_path));
     }
     case PpapiHostMsg_TCPSocket_Create::ID: {
-      if (CanCreateSocket()) {
-        scoped_refptr<ResourceMessageFilter> tcp_socket(
-            new PepperTCPSocketMessageFilter(host_,
-                                             instance,
-                                             false));
-        return scoped_ptr<ResourceHost>(new MessageFilterHost(
-            host_->GetPpapiHost(), instance, params.pp_resource(), tcp_socket));
-      } else {
+      ppapi::TCPSocketVersion version;
+      PP_NetAddress_Family family;
+      if (!CanCreateSocket() ||
+          !UnpackMessage<PpapiHostMsg_TCPSocket_Create>(
+              message, &version, &family)) {
         return scoped_ptr<ResourceHost>();
       }
+
+      scoped_refptr<ResourceMessageFilter> tcp_socket(
+          PepperTCPSocketMessageFilter::Create(this, host_, instance, version,
+                                               family));
+      if (!tcp_socket)
+        return scoped_ptr<ResourceHost>();
+
+      return scoped_ptr<ResourceHost>(new MessageFilterHost(
+          host_->GetPpapiHost(), instance, params.pp_resource(), tcp_socket));
     }
     case PpapiHostMsg_UDPSocket_Create::ID: {
       if (CanCreateSocket()) {
         scoped_refptr<ResourceMessageFilter> udp_socket(
             new PepperUDPSocketMessageFilter(host_, instance, false));
         return scoped_ptr<ResourceHost>(new MessageFilterHost(
             host_->GetPpapiHost(), instance, params.pp_resource(), udp_socket));
       } else {
         return scoped_ptr<ResourceHost>();
       }
@@ skipping 43 matching lines @@
       scoped_refptr<ResourceMessageFilter> tcp_server_socket(
           new PepperTCPServerSocketMessageFilter(this, host_, instance, true));
       return scoped_ptr<ResourceHost>(new MessageFilterHost(
           host_->GetPpapiHost(), instance, params.pp_resource(),
           tcp_server_socket));
     } else {
       return scoped_ptr<ResourceHost>();
     }
   }
   if (message.type() == PpapiHostMsg_TCPSocket_CreatePrivate::ID) {
-    if (CanCreateSocket()) {
-      scoped_refptr<ResourceMessageFilter> tcp_socket(
-          new PepperTCPSocketMessageFilter(host_,
-                                           instance,
-                                           true));
-      return scoped_ptr<ResourceHost>(new MessageFilterHost(
-          host_->GetPpapiHost(), instance, params.pp_resource(), tcp_socket));
-    } else {
+    if (!CanCreateSocket())
       return scoped_ptr<ResourceHost>();
-    }
+
+    scoped_refptr<ResourceMessageFilter> tcp_socket(
+        PepperTCPSocketMessageFilter::Create(
+            this, host_, instance, ppapi::TCP_SOCKET_VERSION_PRIVATE,
+            PP_NETADDRESS_FAMILY_UNSPECIFIED));
+    if (!tcp_socket)
+      return scoped_ptr<ResourceHost>();
+
+    return scoped_ptr<ResourceHost>(new MessageFilterHost(
+        host_->GetPpapiHost(), instance, params.pp_resource(), tcp_socket));

[bbudge, 2013/09/17 19:42:18]

There's a lot of code in common here and above. Could you create a utility
function that takes the instance, version and family?

You could call that directly here. Above you would unpack the message and call
it.

[yzshen1, 2013/09/18 16:56:26]

Done.

   }
   if (message.type() == PpapiHostMsg_UDPSocket_CreatePrivate::ID) {
     if (CanCreateSocket()) {
       scoped_refptr<ResourceMessageFilter> udp_socket(
           new PepperUDPSocketMessageFilter(host_, instance, true));
       return scoped_ptr<ResourceHost>(new MessageFilterHost(
           host_->GetPpapiHost(), instance, params.pp_resource(), udp_socket));
     } else {
       return scoped_ptr<ResourceHost>();
     }
@@ skipping 11 matching lines @@
       }
     }
   }
 
   return scoped_ptr<ResourceHost>();
 }
 
 scoped_ptr<ppapi::host::ResourceHost>
 ContentBrowserPepperHostFactory::CreateAcceptedTCPSocket(
     PP_Instance instance,
-    bool private_api,
-    net::StreamSocket* socket) {
-  scoped_ptr<net::StreamSocket> s(socket);
-
+    ppapi::TCPSocketVersion version,
+    scoped_ptr<net::TCPSocket> socket) {
   if (!CanCreateSocket())
     return scoped_ptr<ResourceHost>();
   scoped_refptr<ResourceMessageFilter> tcp_socket(
-      new PepperTCPSocketMessageFilter(host_,
-                                       instance,
-                                       private_api,
-                                       s.release()));
+      new PepperTCPSocketMessageFilter(host_, instance, version,

[bbudge, 2013/09/17 19:42:18]

Why don't you call PepperTCPSocketMessageFilter::Create here?

[yzshen1, 2013/09/18 16:56:26]

Because this class has a static Create() method for new sockets (which could
fail and return NULL) and a constructor for accepted sockets(which take
different parameters than Create()).

On 2013/09/17 19:42:18, bbudge1 wrote:

+                                       socket.Pass()));
   return scoped_ptr<ResourceHost>(new MessageFilterHost(
       host_->GetPpapiHost(), instance, 0, tcp_socket));
 }
 
 const ppapi::PpapiPermissions&
 ContentBrowserPepperHostFactory::GetPermissions() const {
   return host_->GetPpapiHost()->permissions();
 }
 
 }  // namespace content