Add GetBoundAddress to PPB_UDPSocket_Private

content/browser/renderer_host/pepper_udp_socket.cc

 // Copyright (c) 2011 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_udp_socket.h"
 
 #include <string.h>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ skipping 31 matching lines @@
 
   net::IPEndPoint address;
   if (!socket_.get() ||
       !NetAddressPrivateImpl::NetAddressToIPEndPoint(addr, &address)) {
     SendBindACK(false);
     return;
   }
 
   int result = socket_->Listen(address);
 
+  // If we are successful, get the local address we bound to.

[viettrungluu, 2012/02/07 23:03:58]

Nit: This comment is useless; it's self-evident from the code.

[mtilburg1, 2012/02/08 15:27:01]

Done.

+  if (result == net::OK) {

[viettrungluu, 2012/02/07 23:03:58]

Nit: Other single-line if statements in the file don't have braces. Be
consistent.

[mtilburg1, 2012/02/08 15:27:01]

Done.

+    socket_->GetLocalAddress(&bound_address_);
+  }
+
   SendBindACK(result == net::OK);
 }
 
 void PepperUDPSocket::RecvFrom(int32_t num_bytes) {
   if (recvfrom_buffer_.get()) {
     SendRecvFromACKError();
     return;
   }
 
   recvfrom_buffer_ = new net::IOBuffer(num_bytes);
@@ skipping 37 matching lines @@
       routing_id_, plugin_dispatcher_id_, socket_id_, false, std::string(),
       addr));
 }
 
 void PepperUDPSocket::SendSendToACKError() {
   manager_->Send(new PpapiMsg_PPBUDPSocket_SendToACK(
       routing_id_, plugin_dispatcher_id_, socket_id_, false, 0));
 }
 
 void PepperUDPSocket::SendBindACK(bool result) {
+  PP_NetAddress_Private addr = NetAddressPrivateImpl::kInvalidNetAddress;
+  if (!NetAddressPrivateImpl::IPEndPointToNetAddress(bound_address_, &addr))

[viettrungluu, 2012/02/07 23:03:58]

Shouldn't you do some other cleanup here, rather than just setting the result to
false?

In any case, this seems like a very strange place to do this. Shouldn't you do
this from where SendBindACK is called? And I'm guessing you shouldn't even try
to do IPEndPointToNetAddress() in the failure case, no?

[mtilburg1, 2012/02/08 15:27:01]

Changed to be consistant with GetRecvFromACKError...

Done.

+    result = false;
+
   manager_->Send(new PpapiMsg_PPBUDPSocket_BindACK(
-      routing_id_, plugin_dispatcher_id_, socket_id_, result));
+      routing_id_, plugin_dispatcher_id_, socket_id_, result, addr));
 }
 
 void PepperUDPSocket::OnRecvFromCompleted(int result) {
   DCHECK(recvfrom_buffer_.get());
 
   // Convert IPEndPoint we get back from RecvFrom to a PP_NetAddress_Private,
   // to send back.
   PP_NetAddress_Private addr = NetAddressPrivateImpl::kInvalidNetAddress;
   if (result < 0 ||
       !NetAddressPrivateImpl::IPEndPointToNetAddress(recvfrom_address_,
                                                      &addr)) {
     SendRecvFromACKError();
   } else {
     manager_->Send(new PpapiMsg_PPBUDPSocket_RecvFromACK(
         routing_id_, plugin_dispatcher_id_, socket_id_, true,
         std::string(recvfrom_buffer_->data(), result), addr));
   }
 
   recvfrom_buffer_ = NULL;
 }
 
 void PepperUDPSocket::OnSendToCompleted(int result) {
   DCHECK(sendto_buffer_.get());
 
   manager_->Send(new PpapiMsg_PPBUDPSocket_SendToACK(
       routing_id_, plugin_dispatcher_id_, socket_id_, true, result));
 
   sendto_buffer_ = NULL;
 }