Introduce PPB_TCPSocket_Dev.

ppapi/proxy/ppb_tcp_socket_proxy.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright (c) 2013 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 "ppapi/proxy/ppb_tcp_socket_private_proxy.h"
+#include "ppapi/proxy/ppb_tcp_socket_proxy.h"
 
 #include <map>
 
 #include "base/logging.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/plugin_globals.h"
-#include "ppapi/proxy/plugin_resource_tracker.h"
 #include "ppapi/proxy/ppapi_messages.h"
-#include "ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h"
-#include "ppapi/shared_impl/private/tcp_socket_private_impl.h"
 #include "ppapi/shared_impl/resource.h"
+#include "ppapi/shared_impl/tcp_socket_shared.h"
+#include "ppapi/thunk/enter.h"
+#include "ppapi/thunk/ppb_net_address_api.h"
+#include "ppapi/thunk/ppb_tcp_socket_api.h"
 #include "ppapi/thunk/thunk.h"
 
 namespace ppapi {
 namespace proxy {
 
 namespace {
 
-typedef std::map<uint32, TCPSocketPrivateImpl*> IDToSocketMap;
+typedef thunk::EnterResourceNoLock<thunk::PPB_NetAddress_API>
+    EnterNetAddressNoLock;
+
+typedef std::map<uint32, TCPSocketShared*> IDToSocketMap;
 IDToSocketMap* g_id_to_socket = NULL;
 
-class TCPSocket : public TCPSocketPrivateImpl {
+class TCPSocket : public thunk::PPB_TCPSocket_API,
+                  public Resource,
+                  public TCPSocketShared {
  public:
-  // C-tor for new sockets.
   TCPSocket(const HostResource& resource, uint32 socket_id);
-  // C-tor for already connected sockets.
-  TCPSocket(const HostResource& resource,
-            uint32 socket_id,
-            const PP_NetAddress_Private& local_addr,
-            const PP_NetAddress_Private& remote_addr);
   virtual ~TCPSocket();
 
+  // Resource overrides.
+  virtual thunk::PPB_TCPSocket_API* AsPPB_TCPSocket_API() OVERRIDE;
+
+  // thunk::PPB_TCPSocket_API implementation.
+  virtual int32_t Connect(PP_Resource addr,
+                          scoped_refptr<TrackedCallback> callback) OVERRIDE;
+  virtual PP_Resource GetLocalAddress() OVERRIDE;
+  virtual PP_Resource GetRemoteAddress() OVERRIDE;
+  virtual int32_t Read(char* buffer,
+                       int32_t bytes_to_read,
+                       scoped_refptr<TrackedCallback> callback) OVERRIDE;
+  virtual int32_t Write(const char* buffer,
+                        int32_t bytes_to_write,
+                        scoped_refptr<TrackedCallback> callback) OVERRIDE;
+  virtual void Close() OVERRIDE;
+  virtual int32_t SetOption(PP_TCPSocket_Option_Dev name,
+                            const PP_Var& value,
+                            scoped_refptr<TrackedCallback> callback) OVERRIDE;
+
+  // TCPSocketShared implementation.
   virtual void SendConnect(const std::string& host, uint16_t port) OVERRIDE;
   virtual void SendConnectWithNetAddress(
       const PP_NetAddress_Private& addr) OVERRIDE;
   virtual void SendSSLHandshake(
       const std::string& server_name,
       uint16_t server_port,
       const std::vector<std::vector<char> >& trusted_certs,
       const std::vector<std::vector<char> >& untrusted_certs) OVERRIDE;
   virtual void SendRead(int32_t bytes_to_read) OVERRIDE;
   virtual void SendWrite(const std::string& buffer) OVERRIDE;
   virtual void SendDisconnect() OVERRIDE;
   virtual void SendSetBoolOption(PP_TCPSocketOption_Private name,
                                  bool value) OVERRIDE;
+  virtual Resource* GetOwnerResource() OVERRIDE;
 
  private:
   void SendToBrowser(IPC::Message* msg);
 
   DISALLOW_COPY_AND_ASSIGN(TCPSocket);
 };
 
 TCPSocket::TCPSocket(const HostResource& resource, uint32 socket_id)
-    : TCPSocketPrivateImpl(resource, socket_id) {
+    : Resource(OBJECT_IS_PROXY, resource),
+      TCPSocketShared(OBJECT_IS_PROXY, socket_id) {
   if (!g_id_to_socket)
     g_id_to_socket = new IDToSocketMap();
   DCHECK(g_id_to_socket->find(socket_id) == g_id_to_socket->end());
   (*g_id_to_socket)[socket_id] = this;
 }
 
-TCPSocket::TCPSocket(const HostResource& resource,
-                     uint32 socket_id,
-                     const PP_NetAddress_Private& local_addr,
-                     const PP_NetAddress_Private& remote_addr)
-    : TCPSocketPrivateImpl(resource, socket_id) {
-  if (!g_id_to_socket)
-    g_id_to_socket = new IDToSocketMap();
-  DCHECK(g_id_to_socket->find(socket_id) == g_id_to_socket->end());
-
-  connection_state_ = CONNECTED;
-  local_addr_ = local_addr;
-  remote_addr_ = remote_addr;
-
-  (*g_id_to_socket)[socket_id] = this;
+TCPSocket::~TCPSocket() {
+  DisconnectImpl();
 }
 
-TCPSocket::~TCPSocket() {
-  Disconnect();
+thunk::PPB_TCPSocket_API* TCPSocket::AsPPB_TCPSocket_API() {
+  return this;
+}
+
+int32_t TCPSocket::Connect(PP_Resource addr,
+                           scoped_refptr<TrackedCallback> callback) {
+  EnterNetAddressNoLock enter(addr, true);
+  if (enter.failed())
+    return PP_ERROR_BADARGUMENT;
+
+  return ConnectWithNetAddressImpl(&enter.object()->GetNetAddressPrivate(),
+                                   callback);
+}
+
+PP_Resource TCPSocket::GetLocalAddress() {
+  PP_NetAddress_Private addr_private;
+  if (!GetLocalAddressImpl(&addr_private))
+    return 0;
+
+  thunk::EnterResourceCreationNoLock enter(pp_instance());
+  if (enter.failed())
+    return 0;
+  return enter.functions()->CreateNetAddressFromNetAddressPrivate(
+      pp_instance(), addr_private);
+}
+
+PP_Resource TCPSocket::GetRemoteAddress() {
+  PP_NetAddress_Private addr_private;
+  if (!GetRemoteAddressImpl(&addr_private))
+    return 0;
+
+  thunk::EnterResourceCreationNoLock enter(pp_instance());
+  if (enter.failed())
+    return 0;
+  return enter.functions()->CreateNetAddressFromNetAddressPrivate(
+      pp_instance(), addr_private);
+}
+
+int32_t TCPSocket::Read(char* buffer,
+                        int32_t bytes_to_read,
+                        scoped_refptr<TrackedCallback> callback) {
+  return ReadImpl(buffer, bytes_to_read, callback);
+}
+
+int32_t TCPSocket::Write(const char* buffer,
+                         int32_t bytes_to_write,
+                         scoped_refptr<TrackedCallback> callback) {
+  return WriteImpl(buffer, bytes_to_write, callback);
+}
+
+void TCPSocket::Close() {
+  DisconnectImpl();
+}
+
+int32_t TCPSocket::SetOption(PP_TCPSocket_Option_Dev name,
+                             const PP_Var& value,
+                             scoped_refptr<TrackedCallback> callback) {
+  // TODO(yzshen): Add support for other options.
+  if (name == PP_TCPSOCKET_OPTION_NO_DELAY)
+    return SetOptionImpl(PP_TCPSOCKETOPTION_NO_DELAY, value, callback);
+
+  return PP_ERROR_NOTSUPPORTED;
 }
 
 void TCPSocket::SendConnect(const std::string& host, uint16_t port) {
-  SendToBrowser(new PpapiHostMsg_PPBTCPSocket_Connect(
-      API_ID_PPB_TCPSOCKET_PRIVATE, socket_id_, host, port));
+  NOTREACHED();
 }
 
 void TCPSocket::SendConnectWithNetAddress(const PP_NetAddress_Private& addr) {
   SendToBrowser(new PpapiHostMsg_PPBTCPSocket_ConnectWithNetAddress(
-      API_ID_PPB_TCPSOCKET_PRIVATE, socket_id_, addr));
+      API_ID_PPB_TCPSOCKET, socket_id_, addr));
 }
 
 void TCPSocket::SendSSLHandshake(
     const std::string& server_name,
     uint16_t server_port,
     const std::vector<std::vector<char> >& trusted_certs,
     const std::vector<std::vector<char> >& untrusted_certs) {
-  SendToBrowser(new PpapiHostMsg_PPBTCPSocket_SSLHandshake(
-      socket_id_, server_name, server_port, trusted_certs, untrusted_certs));
+  NOTREACHED();
 }
 
 void TCPSocket::SendRead(int32_t bytes_to_read) {
   SendToBrowser(new PpapiHostMsg_PPBTCPSocket_Read(socket_id_, bytes_to_read));
 }
 
 void TCPSocket::SendWrite(const std::string& buffer) {
   SendToBrowser(new PpapiHostMsg_PPBTCPSocket_Write(socket_id_, buffer));
 }
 
 void TCPSocket::SendDisconnect() {
   // After removed from the mapping, this object won't receive any notifications
   // from the proxy.
   DCHECK(g_id_to_socket->find(socket_id_) != g_id_to_socket->end());
   g_id_to_socket->erase(socket_id_);
   SendToBrowser(new PpapiHostMsg_PPBTCPSocket_Disconnect(socket_id_));
 }
 
 void TCPSocket::SendSetBoolOption(PP_TCPSocketOption_Private name, bool value) {
   SendToBrowser(
       new PpapiHostMsg_PPBTCPSocket_SetBoolOption(socket_id_, name, value));
 }
 
+Resource* TCPSocket::GetOwnerResource() {
+  return this;
+}
+
 void TCPSocket::SendToBrowser(IPC::Message* msg) {
   PluginGlobals::Get()->GetBrowserSender()->Send(msg);
 }
 
 }  // namespace
 
 //------------------------------------------------------------------------------
 
-PPB_TCPSocket_Private_Proxy::PPB_TCPSocket_Private_Proxy(Dispatcher* dispatcher)
+PPB_TCPSocket_Proxy::PPB_TCPSocket_Proxy(Dispatcher* dispatcher)
     : InterfaceProxy(dispatcher) {
 }
 
-PPB_TCPSocket_Private_Proxy::~PPB_TCPSocket_Private_Proxy() {
+PPB_TCPSocket_Proxy::~PPB_TCPSocket_Proxy() {
 }
 
 // static
-PP_Resource PPB_TCPSocket_Private_Proxy::CreateProxyResource(
-    PP_Instance instance) {
+PP_Resource PPB_TCPSocket_Proxy::CreateProxyResource(PP_Instance instance) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
   if (!dispatcher)
     return 0;
 
   uint32 socket_id = 0;
   PluginGlobals::Get()->GetBrowserSender()->Send(
       new PpapiHostMsg_PPBTCPSocket_Create(
-          API_ID_PPB_TCPSOCKET_PRIVATE, dispatcher->plugin_dispatcher_id(),
+          API_ID_PPB_TCPSOCKET, dispatcher->plugin_dispatcher_id(),
           &socket_id));
   if (socket_id == 0)
     return 0;
   return (new TCPSocket(HostResource::MakeInstanceOnly(instance),
                         socket_id))->GetReference();
 }
 
-// static
-PP_Resource PPB_TCPSocket_Private_Proxy::CreateProxyResourceForConnectedSocket(
-    PP_Instance instance,
-    uint32 socket_id,
-    const PP_NetAddress_Private& local_addr,
-    const PP_NetAddress_Private& remote_addr) {
-  return (new TCPSocket(HostResource::MakeInstanceOnly(instance),
-                        socket_id,
-                        local_addr,
-                        remote_addr))->GetReference();
-}
-
-bool PPB_TCPSocket_Private_Proxy::OnMessageReceived(const IPC::Message& msg) {
+bool PPB_TCPSocket_Proxy::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(PPB_TCPSocket_Private_Proxy, msg)
+  IPC_BEGIN_MESSAGE_MAP(PPB_TCPSocket_Proxy, msg)
     IPC_MESSAGE_HANDLER(PpapiMsg_PPBTCPSocket_ConnectACK,
                         OnMsgConnectACK)
-    IPC_MESSAGE_HANDLER(PpapiMsg_PPBTCPSocket_SSLHandshakeACK,
-                        OnMsgSSLHandshakeACK)
     IPC_MESSAGE_HANDLER(PpapiMsg_PPBTCPSocket_ReadACK, OnMsgReadACK)
     IPC_MESSAGE_HANDLER(PpapiMsg_PPBTCPSocket_WriteACK, OnMsgWriteACK)
     IPC_MESSAGE_HANDLER(PpapiMsg_PPBTCPSocket_SetBoolOptionACK,
                         OnMsgSetBoolOptionACK)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
-void PPB_TCPSocket_Private_Proxy::OnMsgConnectACK(
+void PPB_TCPSocket_Proxy::OnMsgConnectACK(
     uint32 /* plugin_dispatcher_id */,
     uint32 socket_id,
     bool succeeded,
     const PP_NetAddress_Private& local_addr,
     const PP_NetAddress_Private& remote_addr) {
   if (!g_id_to_socket) {
     NOTREACHED();
     return;
   }
   IDToSocketMap::iterator iter = g_id_to_socket->find(socket_id);
   if (iter == g_id_to_socket->end())
     return;
   iter->second->OnConnectCompleted(succeeded, local_addr, remote_addr);
 }
 
-void PPB_TCPSocket_Private_Proxy::OnMsgSSLHandshakeACK(
-    uint32 /* plugin_dispatcher_id */,
-    uint32 socket_id,
-    bool succeeded,
-    const PPB_X509Certificate_Fields& certificate_fields) {
+void PPB_TCPSocket_Proxy::OnMsgReadACK(uint32 /* plugin_dispatcher_id */,
+                                       uint32 socket_id,
+                                       bool succeeded,
+                                       const std::string& data) {
   if (!g_id_to_socket) {
     NOTREACHED();
     return;
-  }
-  IDToSocketMap::iterator iter = g_id_to_socket->find(socket_id);
-  if (iter == g_id_to_socket->end())
-    return;
-  iter->second->OnSSLHandshakeCompleted(succeeded, certificate_fields);
-}
-
-void PPB_TCPSocket_Private_Proxy::OnMsgReadACK(
-    uint32 /* plugin_dispatcher_id */,
-    uint32 socket_id,
-    bool succeeded,
-    const std::string& data) {
-  if (!g_id_to_socket) {
-    NOTREACHED();
-    return;
   }
   IDToSocketMap::iterator iter = g_id_to_socket->find(socket_id);
   if (iter == g_id_to_socket->end())
     return;
   iter->second->OnReadCompleted(succeeded, data);
 }
 
-void PPB_TCPSocket_Private_Proxy::OnMsgWriteACK(
-    uint32 /* plugin_dispatcher_id */,
-    uint32 socket_id,
-    bool succeeded,
-    int32_t bytes_written) {
+void PPB_TCPSocket_Proxy::OnMsgWriteACK(uint32 /* plugin_dispatcher_id */,
+                                        uint32 socket_id,
+                                        bool succeeded,
+                                        int32_t bytes_written) {
   if (!g_id_to_socket) {
     NOTREACHED();
     return;
   }
   IDToSocketMap::iterator iter = g_id_to_socket->find(socket_id);
   if (iter == g_id_to_socket->end())
     return;
   iter->second->OnWriteCompleted(succeeded, bytes_written);
 }
 
-void PPB_TCPSocket_Private_Proxy::OnMsgSetBoolOptionACK(
+void PPB_TCPSocket_Proxy::OnMsgSetBoolOptionACK(
     uint32 /* plugin_dispatcher_id */,
     uint32 socket_id,
     bool succeeded) {
   if (!g_id_to_socket) {
     NOTREACHED();
     return;
   }
   IDToSocketMap::iterator iter = g_id_to_socket->find(socket_id);
   if (iter == g_id_to_socket->end())
     return;
   iter->second->OnSetOptionCompleted(succeeded);
 }
 
 }  // namespace proxy
 }  // namespace ppapi