Switched proxy for TCPServerSocketPrivate.

ppapi/proxy/tcp_server_socket_private_resource.cc

Index: ppapi/proxy/tcp_server_socket_private_resource.cc
diff --git a/ppapi/proxy/tcp_server_socket_private_resource.cc b/ppapi/proxy/tcp_server_socket_private_resource.cc
new file mode 100644
index 0000000000000000000000000000000000000000..567a31e2dfd6194038f962720447e61a1138aff0
--- /dev/null
+++ b/ppapi/proxy/tcp_server_socket_private_resource.cc
@@ -0,0 +1,138 @@
+// 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/tcp_server_socket_private_resource.h"
+
+#include "ppapi/proxy/plugin_dispatcher.h"
+#include "ppapi/proxy/ppapi_messages.h"
+#include "ppapi/proxy/ppb_tcp_socket_private_proxy.h"
+
+namespace ppapi {
+namespace proxy {
+
+TCPServerSocketPrivateResource::TCPServerSocketPrivateResource(
+    Connection connection,
+    PP_Instance instance)
+    : PluginResource(connection, instance),
+      state_(STATE_BEFORE_LISTENING),
+      local_addr_(),
+      plugin_dispatcher_id_(0) {
+  SendCreate(BROWSER, PpapiHostMsg_TCPServerSocket_CreatePrivate());
+
+  PluginDispatcher* dispatcher = PluginDispatcher::GetForInstance(instance);
+  if (dispatcher)
+    plugin_dispatcher_id_ = dispatcher->plugin_dispatcher_id();
+  else
+    NOTREACHED();
+}
+
+TCPServerSocketPrivateResource::~TCPServerSocketPrivateResource() {
+}
+
+thunk::PPB_TCPServerSocket_Private_API*
+TCPServerSocketPrivateResource::AsPPB_TCPServerSocket_Private_API() {
+  return this;
+}
+
+int32_t TCPServerSocketPrivateResource::Listen(
+    const PP_NetAddress_Private* addr,
+    int32_t backlog,
+    scoped_refptr<TrackedCallback> callback) {
+  if (!addr)
+    return PP_ERROR_BADARGUMENT;
+  if (state_ == STATE_LISTEN_IN_PROGRESS)
+    return PP_ERROR_INPROGRESS;
+  if (state_ != STATE_BEFORE_LISTENING)
+    return PP_ERROR_FAILED;
+  state_ = STATE_LISTEN_IN_PROGRESS;
+
+  // Send the request, the browser will call us back via ListenACK
+  Call<PpapiPluginMsg_TCPServerSocket_ListenReply>(
+      BROWSER,
+      PpapiHostMsg_TCPServerSocket_Listen(*addr, backlog),
+      base::Bind(&TCPServerSocketPrivateResource::OnPluginMsgListenReply,
+                 base::Unretained(this),
+                 callback));
+  return PP_OK_COMPLETIONPENDING;
+}
+
+int32_t TCPServerSocketPrivateResource::Accept(
+    PP_Resource* tcp_socket,
+    scoped_refptr<TrackedCallback> callback) {
+  if (!tcp_socket)
+    return PP_ERROR_BADARGUMENT;
+  if (state_ == STATE_ACCEPT_IN_PROGRESS)
+    return PP_ERROR_INPROGRESS;
+  if (state_ != STATE_LISTENING)
+    return PP_ERROR_FAILED;
+
+  state_ = STATE_ACCEPT_IN_PROGRESS;
+
+  Call<PpapiPluginMsg_TCPServerSocket_AcceptReply>(
+      BROWSER,
+      PpapiHostMsg_TCPServerSocket_Accept(plugin_dispatcher_id_),
+      base::Bind(&TCPServerSocketPrivateResource::OnPluginMsgAcceptReply,
+                 base::Unretained(this),
+                 tcp_socket, callback));
+  return PP_OK_COMPLETIONPENDING;
+}
+
+int32_t TCPServerSocketPrivateResource::GetLocalAddress(
+    PP_NetAddress_Private* addr) {
+  if (!addr)
+    return PP_ERROR_BADARGUMENT;
+  if (state_ != STATE_LISTENING)

[yzshen1, 2013/07/19 23:51:58]

The previous behavior is that if there is a pending accept, it should still
succeed.

[ygorshenin1, 2013/07/29 14:03:57]

Done.

+    return PP_ERROR_FAILED;
+  *addr = local_addr_;
+  return PP_OK;
+}
+
+void TCPServerSocketPrivateResource::StopListening() {
+  if (state_ == STATE_CLOSED)
+    return;
+  state_ = STATE_CLOSED;
+  Post(BROWSER, PpapiHostMsg_TCPServerSocket_StopListening());

[yzshen1, 2013/07/19 23:51:58]

It is nice to abort listen/accept callbacks here, if any.
That matches the previous behavior, as well as behavior of TCP/UDP socket.

[ygorshenin1, 2013/07/29 14:03:57]

Done.

+}
+
+void TCPServerSocketPrivateResource::OnPluginMsgListenReply(
+    scoped_refptr<TrackedCallback> callback,
+    const ResourceMessageReplyParams& params,
+    const PP_NetAddress_Private& local_addr) {
+  if (state_ != STATE_LISTEN_IN_PROGRESS ||
+      !TrackedCallback::IsPending(callback)) {
+    return;
+  }
+  if (params.result() == PP_OK) {
+    local_addr_ = local_addr;
+    state_ = STATE_LISTENING;

[yzshen1, 2013/07/19 23:51:58]

We should properly set |state_| on failure.

The previous code stays in the before_listening state, but now that you have
added listen_in_progress, you need to make change accordingly.

[ygorshenin1, 2013/07/29 14:03:57]

Done.

+  }
+  callback->Run(params.result());
+}
+
+void TCPServerSocketPrivateResource::OnPluginMsgAcceptReply(
+    PP_Resource* tcp_socket,
+    scoped_refptr<TrackedCallback> callback,
+    const ResourceMessageReplyParams& params,
+    uint32 accepted_socket_id,
+    const PP_NetAddress_Private& local_addr,
+    const PP_NetAddress_Private& remote_addr) {
+  DCHECK(tcp_socket);
+  if (state_ != STATE_ACCEPT_IN_PROGRESS ||
+      !TrackedCallback::IsPending(callback)) {
+    return;

[yzshen1, 2013/07/19 23:51:58]

Please also reset |state_| here.

[ygorshenin1, 2013/07/29 14:03:57]

Done.

+  }
+  if (params.result() == PP_OK) {
+    *tcp_socket =
+        PPB_TCPSocket_Private_Proxy::CreateProxyResourceForConnectedSocket(
+            pp_instance(),
+            accepted_socket_id,
+            local_addr,
+            remote_addr);
+  }
+  state_ = STATE_LISTENING;
+  callback->Run(params.result());
+}
+
+}  // namespace proxy
+}  // namespace ppapi