Initial work for UDP Pepper API

content/browser/renderer_host/pepper_message_filter.cc

Index: content/browser/renderer_host/pepper_message_filter.cc
diff --git a/content/browser/renderer_host/pepper_message_filter.cc b/content/browser/renderer_host/pepper_message_filter.cc
index f4c2cfce5993a0ce607dec373082088a10982b34..29d484094ef3c8fb77fa471a4c61bbc8529ebd88 100644
--- a/content/browser/renderer_host/pepper_message_filter.cc
+++ b/content/browser/renderer_host/pepper_message_filter.cc
@@ -38,6 +38,7 @@
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/socket/tcp_client_socket.h"
+#include "net/udp/udp_server_socket.h"
 #include "net/url_request/url_request_context.h"
 #include "ppapi/c/private/ppb_flash_net_connector.h"
 #include "ppapi/proxy/ppapi_messages.h"
@@ -100,16 +101,28 @@ bool AddressListToNetAddress(const net::AddressList& address_list,
          SockaddrToNetAddress(head->ai_addr, head->ai_addrlen, net_addr);
 }
 
+bool NetAddressToIPEndPoint(const PP_Flash_NetAddress& net_addr,
+                            net::IPEndPoint* ip_end_point) {
+  if (!ip_end_point || !ValidateNetAddress(net_addr))
+    return false;
+
+  if (!ip_end_point->FromSockAddr(
+      reinterpret_cast<const sockaddr*>(net_addr.data), net_addr.size)) {
+    return false;
+  }
+
+  return true;
+}
+
 bool NetAddressToAddressList(const PP_Flash_NetAddress& net_addr,
                              net::AddressList* address_list) {
-  if (!address_list || !ValidateNetAddress(net_addr))
+  if (!address_list)
     return false;
 
   net::IPEndPoint ip_end_point;
-  if (!ip_end_point.FromSockAddr(
-      reinterpret_cast<const sockaddr*>(net_addr.data), net_addr.size)) {
+  if (!NetAddressToIPEndPoint(net_addr, &ip_end_point))
     return false;
-  }
+
   *address_list = net::AddressList::CreateFromIPAddress(ip_end_point.address(),
                                                         ip_end_point.port());
   return true;
@@ -195,9 +208,65 @@ class PepperMessageFilter::FlashTCPSocket {
   DISALLOW_COPY_AND_ASSIGN(FlashTCPSocket);
 };
 
+// Base class for TCP and UDP socket managers

[viettrungluu, 2011/09/22 16:45:34]

Needs punctation.

[mtilburg, 2011/09/22 23:44:34]

Done.

+template<class SocketType>
+class PepperMessageFilter::FlashSocketManager {
+ public:
+  explicit FlashSocketManager(PepperMessageFilter* pepper_message_filter);

[viettrungluu, 2011/09/22 16:45:34]

You may as well inline the definitions of these methods, seeing as how it's in a
.cc file and not a header file.

[mtilburg, 2011/09/22 23:44:34]

this might change if we move all this to another file

+
+ protected:
+  // |socket_id| will be set to 0 on failure, non-zero otherwise.
+  bool GenerateSocketID(uint32* socket_id);
+
+  uint32 next_socket_id_;
+  PepperMessageFilter* pepper_message_filter_;
+
+  // SocketMap can hold either FlashTCPSocket or FlashUDPSocket.
+  typedef std::map<uint32, linked_ptr<SocketType> > SocketMap;
+  SocketMap sockets_;
+};
+
+template<class SocketType>
+PepperMessageFilter::FlashSocketManager<SocketType>::FlashSocketManager(
+    PepperMessageFilter* pepper_message_filter)
+    : next_socket_id_(1),
+      pepper_message_filter_(pepper_message_filter) {
+  DCHECK(pepper_message_filter);
+}
+
+template<class SocketType>
+bool PepperMessageFilter::FlashSocketManager<SocketType>::GenerateSocketID(
+    uint32* socket_id) {
+  // Generate a socket ID. For each process which sends us socket requests, IDs
+  // of living sockets must be unique, to each socket type.  TCP and UDP have
+  // unique managers, so the socket ID can be the same in this case

[viettrungluu, 2011/09/22 16:45:34]

Missing period.

[mtilburg, 2011/09/22 23:44:34]

Done.

+  //
+  // However, it is safe to generate IDs based on the internal state of a single
+  // FlashSocketManager object, because for each plugin or renderer process,
+  // there is at most one PepperMessageFilter (there can exist a
+  // FlashTCPSocketManager and a FlashUDPSocketManager in this filter)

[viettrungluu, 2011/09/22 16:45:34]

The parenthetical comment is probably unnecessary.

[mtilburg, 2011/09/22 23:44:34]

Done.

+  // talking to it

[viettrungluu, 2011/09/22 16:45:34]

"

[mtilburg, 2011/09/22 23:44:34]

Done.

+
+  DCHECK(socket_id);

[viettrungluu, 2011/09/22 16:45:34]

This DCHECK() isn't necessary; we're sure to crash anyway if socket_id is null.

[mtilburg, 2011/09/22 23:44:34]

Done.

+  if (sockets_.size() >= std::numeric_limits<uint32>::max()) {

[viettrungluu, 2011/09/22 16:45:34]

It seems silly to do a check like this, since it'll never be hit on 32-bit
systems, and you'll almost certainly have died before hitting it on 64-bit
systems.

It *would* be reasonable to limit the number of sockets, so perhaps a check
should be made against some other number (|kMaxSockets| or some such).

[mtilburg, 2011/09/22 23:44:34]

I don't mind fixing this, if it's incorrect, but I should note, this is not my
code.  Remember this is the code from TCPSocketManager that I moved into the
common parent class so that UDPSocketManager could share it.  We may want to run
these changes by Yuzhu

[yzshen1, 2011/09/23 00:00:45]

This is a good suggestion. (Thanks Trung!) I could do it if you would like me
to.

On 2011/09/22 23:44:34, mtilburg wrote:

+    // All valid IDs are being used.
+    *socket_id = 0;
+    return false;
+  }
+  do {
+    // Although it is unlikely, make sure that we won't cause any trouble when
+    // the counter overflows.
+    *socket_id = next_socket_id_++;
+  } while (*socket_id == 0 ||
+           sockets_.find(*socket_id) != sockets_.end());
+
+  return true;
+}
+
 // FlashTCPSocketManager manages the mapping from socket IDs to FlashTCPSocket
 // instances.
-class PepperMessageFilter::FlashTCPSocketManager {
+class PepperMessageFilter::FlashTCPSocketManager
+    : public FlashSocketManager<FlashTCPSocket> {
  public:
   explicit FlashTCPSocketManager(PepperMessageFilter* pepper_message_filter);

[viettrungluu, 2011/09/22 16:45:34]

Ditto for inlining methods, here and elsewhere.

[mtilburg, 2011/09/22 23:44:34]

Again... this is not my code... furthermore, inlining all these functions causes
problems because FlashTCPSocket and FlashTCPSocketManager reference each
other... I think we should keep this review in the scope of UDP

 
@@ -228,13 +297,6 @@ class PepperMessageFilter::FlashTCPSocketManager {
   net::CertVerifier* GetCertVerifier();
 
  private:
-  typedef std::map<uint32, linked_ptr<FlashTCPSocket> > SocketMap;
-  SocketMap sockets_;
-
-  uint32 next_socket_id_;
-
-  PepperMessageFilter* pepper_message_filter_;
-
   // The default SSL configuration settings are used, as opposed to Chrome's SSL
   // settings.
   net::SSLConfig ssl_config_;
@@ -498,10 +560,174 @@ bool PepperMessageFilter::FlashTCPSocket::IsConnected() const {
          connection_state_ == SSL_CONNECTED;
 }
 
+class PepperMessageFilter::FlashUDPSocket {
+ public:
+  FlashUDPSocket(PepperMessageFilter* pepper_message_filter,
+                 int32 routing_id,
+                 uint32 plugin_dispatcher_id,
+                 uint32 socket_id);
+  ~FlashUDPSocket();
+
+  void Bind(const PP_Flash_NetAddress& addr);
+  void RecvFrom(int32_t num_bytes);
+  void SendTo(const std::string& data, const PP_Flash_NetAddress& addr);
+
+ private:
+  void SendBindACK(bool result);
+  void SendRecvFromACKError();
+  void SendSendToACKError();
+
+  void OnRecvFromCompleted(int result);
+  void OnSendToCompleted(int result);
+
+  PepperMessageFilter* pepper_message_filter_;
+  int32 routing_id_;
+  uint32 plugin_dispatcher_id_;
+  uint32 socket_id_;
+
+  net::CompletionCallbackImpl<FlashUDPSocket> recvfrom_callback_;
+  net::CompletionCallbackImpl<FlashUDPSocket> sendto_callback_;
+
+  scoped_ptr<net::UDPServerSocket> socket_;
+
+  scoped_refptr<net::IOBuffer> recvfrom_buffer_;
+  scoped_refptr<net::IOBuffer> sendto_buffer_;
+
+  net::IPEndPoint recvfrom_address_;
+
+  DISALLOW_COPY_AND_ASSIGN(FlashUDPSocket);
+};
+
+PepperMessageFilter::FlashUDPSocket::FlashUDPSocket(
+    PepperMessageFilter* pepper_message_filter,
+    int32 routing_id,
+    uint32 plugin_dispatcher_id,
+    uint32 socket_id)
+    : pepper_message_filter_(pepper_message_filter),
+      routing_id_(routing_id),
+      plugin_dispatcher_id_(plugin_dispatcher_id),
+      socket_id_(socket_id),
+      ALLOW_THIS_IN_INITIALIZER_LIST(
+          recvfrom_callback_(this, &FlashUDPSocket::OnRecvFromCompleted)),
+      ALLOW_THIS_IN_INITIALIZER_LIST(
+          sendto_callback_(this, &FlashUDPSocket::OnSendToCompleted)) {
+  DCHECK(pepper_message_filter);
+}
+
+PepperMessageFilter::FlashUDPSocket::~FlashUDPSocket() {
+  // Make sure there are no further callbacks from socket_.
+  if (socket_.get())
+    socket_->Close();
+}
+
+void PepperMessageFilter::FlashUDPSocket::Bind(
+    const PP_Flash_NetAddress& addr) {
+  socket_.reset(new net::UDPServerSocket(NULL, net::NetLog::Source()));
+
+  net::IPEndPoint address;
+  if (!socket_.get() || !NetAddressToIPEndPoint(addr, &address)) {
+    SendBindACK(false);
+    return;
+  }
+
+  int result = socket_->Listen(address);
+
+  SendBindACK(result == net::OK);
+}
+
+void PepperMessageFilter::FlashUDPSocket::RecvFrom(int32_t num_bytes) {
+  if (recvfrom_buffer_.get()) {
+    SendRecvFromACKError();
+    return;
+  }
+
+  recvfrom_buffer_ = new net::IOBuffer(num_bytes);
+  int result = socket_->RecvFrom(recvfrom_buffer_,
+                                 num_bytes,
+                                 &recvfrom_address_,
+                                 &recvfrom_callback_);
+
+  if (result != net::ERR_IO_PENDING)
+    OnRecvFromCompleted(result);
+}
+
+void PepperMessageFilter::FlashUDPSocket::SendTo(
+    const std::string& data,
+    const PP_Flash_NetAddress& addr) {
+  if (sendto_buffer_.get() || data.empty()) {
+    SendSendToACKError();
+    return;
+  }
+
+  net::IPEndPoint address;
+  if (!NetAddressToIPEndPoint(addr, &address)) {
+    SendSendToACKError();
+    return;
+  }
+
+  int data_size = data.size();
+
+  sendto_buffer_ = new net::IOBuffer(data_size);
+  memcpy(sendto_buffer_->data(), data.data(), data_size);
+  int result = socket_->SendTo(sendto_buffer_,
+                               data_size,
+                               address,
+                               &sendto_callback_);
+
+  if (result != net::ERR_IO_PENDING)
+    OnSendToCompleted(result);
+}
+
+void PepperMessageFilter::FlashUDPSocket::SendRecvFromACKError() {
+  PP_Flash_NetAddress addr = kInvalidNetAddress;
+  pepper_message_filter_->Send(
+      new PpapiMsg_PPBFlashUDPSocket_RecvFromACK(
+          routing_id_, plugin_dispatcher_id_, socket_id_, false,
+          std::string(), addr));
+}
+
+void PepperMessageFilter::FlashUDPSocket::SendSendToACKError() {
+  pepper_message_filter_->Send(
+      new PpapiMsg_PPBFlashUDPSocket_SendToACK(
+          routing_id_, plugin_dispatcher_id_, socket_id_, false, 0));
+}
+
+void PepperMessageFilter::FlashUDPSocket::SendBindACK(bool result) {
+  pepper_message_filter_->Send(
+      new PpapiMsg_PPBFlashUDPSocket_BindACK(
+          routing_id_, plugin_dispatcher_id_, socket_id_, result));
+}
+
+void PepperMessageFilter::FlashUDPSocket::OnRecvFromCompleted(int result) {
+  DCHECK(recvfrom_buffer_.get());
+
+  // Convert IPEndPoint we get back from RecvFrom to a PP_Flash_NetAddress,
+  // to send back to Flash.
+  PP_Flash_NetAddress addr = kInvalidNetAddress;
+  if (!IPEndPointToNetAddress(recvfrom_address_, &addr) || result < 0)
+    SendRecvFromACKError();
+  else

[brettw, 2011/09/22 20:03:30]

We always use {} if there's more than one line (add to the "if" as well to make
it match).

[mtilburg, 2011/09/22 23:44:34]

Done.

+    pepper_message_filter_->Send(
+        new PpapiMsg_PPBFlashUDPSocket_RecvFromACK(
+            routing_id_, plugin_dispatcher_id_, socket_id_, true,
+            std::string(recvfrom_buffer_->data(), result), addr));
+
+  recvfrom_buffer_ = NULL;
+}
+
+void PepperMessageFilter::FlashUDPSocket::OnSendToCompleted(int result) {
+  DCHECK(sendto_buffer_.get());
+
+  pepper_message_filter_->Send(
+      new PpapiMsg_PPBFlashUDPSocket_SendToACK(
+          routing_id_, plugin_dispatcher_id_, socket_id_, true, result));
+
+  sendto_buffer_ = NULL;
+}
+
 PepperMessageFilter::FlashTCPSocketManager::FlashTCPSocketManager(
     PepperMessageFilter* pepper_message_filter)
-    : next_socket_id_(1),
-      pepper_message_filter_(pepper_message_filter) {
+    : FlashSocketManager<FlashTCPSocket>(pepper_message_filter) {
   DCHECK(pepper_message_filter);

[viettrungluu, 2011/09/22 16:45:34]

This DCHECK() is unnecessary. This class doesn't do anything with
|pepper_message_filter| -- its superclass does (and it already DCHECKs it).

[mtilburg, 2011/09/22 23:44:34]

I'll remove this, but again, this is the TCP code, I didn't write this...

 }
 
@@ -509,26 +735,9 @@ void PepperMessageFilter::FlashTCPSocketManager::OnMsgCreate(
     int32 routing_id,
     uint32 plugin_dispatcher_id,
     uint32* socket_id) {
-  // Generate a socket ID. For each process which sends us socket requests, IDs
-  // of living sockets must be unique.
-  //
-  // However, it is safe to generate IDs based on the internal state of a single
-  // FlashTCPSocketManager object, because for each plugin or renderer process,
-  // there is at most one PepperMessageFilter (in other words, at most one
-  // FlashTCPSocketManager) talking to it.
-
-  DCHECK(socket_id);
-  if (sockets_.size() >= std::numeric_limits<uint32>::max()) {
-    // All valid IDs are being used.
-    *socket_id = 0;
+  if (!GenerateSocketID(socket_id))
     return;
-  }
-  do {
-    // Although it is unlikely, make sure that we won't cause any trouble when
-    // the counter overflows.
-    *socket_id = next_socket_id_++;
-  } while (*socket_id == 0 ||
-           sockets_.find(*socket_id) != sockets_.end());
+
   sockets_[*socket_id] = linked_ptr<FlashTCPSocket>(
       new FlashTCPSocket(this, routing_id, plugin_dispatcher_id, *socket_id));
 }
@@ -617,12 +826,106 @@ PepperMessageFilter::FlashTCPSocketManager::GetCertVerifier() {
   return cert_verifier_.get();
 }
 
+// FlashUDPSocketManager manages the mapping from socket IDs to FlashUDPSocket
+// instances.
+class PepperMessageFilter::FlashUDPSocketManager
+    : public FlashSocketManager<FlashUDPSocket> {
+ public:
+  explicit FlashUDPSocketManager(PepperMessageFilter* pepper_message_filter);
+
+  void OnMsgCreate(int32 routing_id,
+                   uint32 plugin_dispatcher_id,
+                   uint32* socket_id);
+  void OnMsgBind(uint32 socket_id,
+                 const PP_Flash_NetAddress& addr);
+  void OnMsgRecvFrom(uint32 socket_id,
+                     int32_t num_bytes);
+  void OnMsgSendTo(uint32 socket_id,
+                   const std::string& data,
+                   const PP_Flash_NetAddress& addr);
+  void OnMsgClose(uint32 socket_id);
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(FlashUDPSocketManager);
+};
+
+PepperMessageFilter::FlashUDPSocketManager::FlashUDPSocketManager(
+    PepperMessageFilter* pepper_message_filter)
+    : FlashSocketManager<FlashUDPSocket>(pepper_message_filter) {
+  DCHECK(pepper_message_filter);
+}
+
+void PepperMessageFilter::FlashUDPSocketManager::OnMsgCreate(
+    int32 routing_id,
+    uint32 plugin_dispatcher_id,
+    uint32* socket_id) {
+  if (!GenerateSocketID(socket_id))
+    return;
+
+  sockets_[*socket_id] = linked_ptr<FlashUDPSocket>(
+      new FlashUDPSocket(pepper_message_filter_, routing_id,
+                         plugin_dispatcher_id, *socket_id));
+}
+
+void PepperMessageFilter::FlashUDPSocketManager::OnMsgBind(

[viettrungluu, 2011/09/22 16:45:34]

Why do we have to separate Create and Bind anyway?

[yzshen1, 2011/09/22 20:14:27]

I think the current implementation doesn't enforce that Bind is the first method
to be called on a socket object.
For example, SendTo can be called before Bind.

[mtilburg, 2011/09/22 23:44:34]

Create and Bind are separate system calls, so it's reasonable to assume that any
implementation of UDP will have these call separate(as we do in the Flash
Player)

[mtilburg, 2011/09/22 23:44:34]

That's true, and sendto will return an error, which will be returned to the
user.  The same behavior if sendto is called after ::close is called

[yzshen1, 2011/09/23 00:00:45]

Oh, I was trying to answer Trung's question. This is not a review comment. :)

On 2011/09/22 23:44:34, mtilburg wrote:

+    uint32 socket_id,
+    const PP_Flash_NetAddress& addr) {
+  SocketMap::iterator iter = sockets_.find(socket_id);
+  if (iter == sockets_.end()) {

[viettrungluu, 2011/09/22 16:45:34]

Let's just |CHECK(iter != sockets_.end());|.

[mtilburg, 2011/09/22 23:44:34]

Done.

+    NOTREACHED();
+    return;
+  }
+
+  iter->second->Bind(addr);
+}
+
+void PepperMessageFilter::FlashUDPSocketManager::OnMsgRecvFrom(
+    uint32 socket_id,
+    int32_t num_bytes) {
+  SocketMap::iterator iter = sockets_.find(socket_id);
+  if (iter == sockets_.end()) {

[viettrungluu, 2011/09/22 16:45:34]

"

[mtilburg, 2011/09/22 23:44:34]

Done.

+    NOTREACHED();
+    return;
+  }
+
+  iter->second->RecvFrom(num_bytes);
+}
+
+void PepperMessageFilter::FlashUDPSocketManager::OnMsgSendTo(
+    uint32 socket_id,
+    const std::string& data,
+    const PP_Flash_NetAddress& addr) {
+  SocketMap::iterator iter = sockets_.find(socket_id);
+  if (iter == sockets_.end()) {

[viettrungluu, 2011/09/22 16:45:34]

"

[mtilburg, 2011/09/22 23:44:34]

Done.

+    NOTREACHED();
+    return;
+  }
+
+  iter->second->SendTo(data, addr);
+}
+
+void PepperMessageFilter::FlashUDPSocketManager::OnMsgClose(
+    uint32 socket_id) {
+  SocketMap::iterator iter = sockets_.find(socket_id);
+  if (iter == sockets_.end()) {
+    NOTREACHED();
+    return;
+  }
+
+  // Destroy the FlashUDPSocket instance will cancel any pending completion
+  // callback. From this point on, there won't be any messages associated with
+  // this socket sent to the plugin side.
+  sockets_.erase(iter);
+}
+
 PepperMessageFilter::PepperMessageFilter(
     const content::ResourceContext* resource_context)
     : resource_context_(resource_context),
       host_resolver_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(
-          socket_manager_(new FlashTCPSocketManager(this))) {
+          socket_manager_tcp_(new FlashTCPSocketManager(this))),
+      ALLOW_THIS_IN_INITIALIZER_LIST(
+          socket_manager_udp_(new FlashUDPSocketManager(this))) {
   DCHECK(resource_context_);
 }
 
@@ -630,7 +933,9 @@ PepperMessageFilter::PepperMessageFilter(net::HostResolver* host_resolver)
     : resource_context_(NULL),
       host_resolver_(host_resolver),
       ALLOW_THIS_IN_INITIALIZER_LIST(
-          socket_manager_(new FlashTCPSocketManager(this))) {
+          socket_manager_tcp_(new FlashTCPSocketManager(this))),
+      ALLOW_THIS_IN_INITIALIZER_LIST(
+          socket_manager_udp_(new FlashUDPSocketManager(this))) {
   DCHECK(host_resolver);
 }
 
@@ -650,27 +955,45 @@ bool PepperMessageFilter::OnMessageReceived(const IPC::Message& msg,
                                     OnGetFontFamilies)
     IPC_MESSAGE_FORWARD(
         PpapiHostMsg_PPBFlashTCPSocket_Create,
-        socket_manager_.get(), FlashTCPSocketManager::OnMsgCreate)
+        socket_manager_tcp_.get(), FlashTCPSocketManager::OnMsgCreate)
     IPC_MESSAGE_FORWARD(
         PpapiHostMsg_PPBFlashTCPSocket_Connect,
-        socket_manager_.get(), FlashTCPSocketManager::OnMsgConnect)
+        socket_manager_tcp_.get(), FlashTCPSocketManager::OnMsgConnect)
     IPC_MESSAGE_FORWARD(
         PpapiHostMsg_PPBFlashTCPSocket_ConnectWithNetAddress,
-        socket_manager_.get(),
+        socket_manager_tcp_.get(),
         FlashTCPSocketManager::OnMsgConnectWithNetAddress)
     IPC_MESSAGE_FORWARD(
         PpapiHostMsg_PPBFlashTCPSocket_SSLHandshake,
-        socket_manager_.get(),
+        socket_manager_tcp_.get(),
         FlashTCPSocketManager::OnMsgSSLHandshake)
     IPC_MESSAGE_FORWARD(
         PpapiHostMsg_PPBFlashTCPSocket_Read,
-        socket_manager_.get(), FlashTCPSocketManager::OnMsgRead)
+        socket_manager_tcp_.get(), FlashTCPSocketManager::OnMsgRead)
     IPC_MESSAGE_FORWARD(
         PpapiHostMsg_PPBFlashTCPSocket_Write,
-        socket_manager_.get(), FlashTCPSocketManager::OnMsgWrite)
+        socket_manager_tcp_.get(), FlashTCPSocketManager::OnMsgWrite)
     IPC_MESSAGE_FORWARD(
         PpapiHostMsg_PPBFlashTCPSocket_Disconnect,
-        socket_manager_.get(), FlashTCPSocketManager::OnMsgDisconnect)
+        socket_manager_tcp_.get(), FlashTCPSocketManager::OnMsgDisconnect)
+
+    // UDP

[viettrungluu, 2011/09/22 16:45:34]

If this deserves a comment, so too does TCP. Also, punctuation.

[mtilburg, 2011/09/22 23:44:34]

Done.

+    IPC_MESSAGE_FORWARD(
+        PpapiHostMsg_PPBFlashUDPSocket_Create,
+        socket_manager_udp_.get(), FlashUDPSocketManager::OnMsgCreate)
+    IPC_MESSAGE_FORWARD(
+        PpapiHostMsg_PPBFlashUDPSocket_Bind,
+        socket_manager_udp_.get(), FlashUDPSocketManager::OnMsgBind)
+    IPC_MESSAGE_FORWARD(
+        PpapiHostMsg_PPBFlashUDPSocket_RecvFrom,
+        socket_manager_udp_.get(), FlashUDPSocketManager::OnMsgRecvFrom)
+    IPC_MESSAGE_FORWARD(
+        PpapiHostMsg_PPBFlashUDPSocket_SendTo,
+        socket_manager_udp_.get(), FlashUDPSocketManager::OnMsgSendTo)
+    IPC_MESSAGE_FORWARD(
+        PpapiHostMsg_PPBFlashUDPSocket_Close,
+        socket_manager_udp_.get(), FlashUDPSocketManager::OnMsgClose)
+
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP_EX()
   return handled;