Add NetLog support to UDP sockets.

net/udp/udp_socket_win.cc

Index: net/udp/udp_socket_win.cc
===================================================================
--- net/udp/udp_socket_win.cc	(revision 105148)
+++ net/udp/udp_socket_win.cc	(working copy)
@@ -11,6 +11,7 @@
 #include "base/message_loop.h"
 #include "base/metrics/stats_counters.h"
 #include "base/rand_util.h"
+#include "net/base/address_list_net_log_param.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
@@ -18,6 +19,7 @@
 #include "net/base/net_util.h"
 #include "net/base/winsock_init.h"
 #include "net/base/winsock_util.h"
+#include "net/udp/udp_data_transfer_param.h"
 
 namespace {
 
@@ -51,7 +53,7 @@
       recv_from_address_(NULL),
       read_callback_(NULL),
       write_callback_(NULL),
-      net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_SOCKET)) {
+      net_log_(BoundNetLog::Make(net_log, NetLog::SOURCE_UDP_SOCKET)) {
   EnsureWinsockInit();
   scoped_refptr<NetLog::EventParameters> params;
   if (source.is_valid())
@@ -150,8 +152,11 @@
   DCHECK_GT(buf_len, 0);
 
   int nread = InternalRecvFrom(buf, buf_len, address);
-  if (nread != ERR_IO_PENDING)
+  if (nread != ERR_IO_PENDING) {
+    if (nread < 0)
+      net_log_.AddEventWithNetErrorCode(NetLog::TYPE_UDP_RECEIVE_ERROR, nread);

[Sergey Ulanov, 2011/10/14 20:15:47]

nit: InternalRecvFrom() logs success events, so maybe it should log errors too?

[mmenke, 2011/10/17 17:35:20]

Done.

     return nread;
+  }
 
   read_iobuffer_ = buf;
   read_callback_ = callback;
@@ -181,17 +186,33 @@
   DCHECK(!write_callback_);
   DCHECK(callback);  // Synchronous operation not supported.
   DCHECK_GT(buf_len, 0);
+  DCHECK(!send_to_address_.get());
 
   int nwrite = InternalSendTo(buf, buf_len, address);
-  if (nwrite != ERR_IO_PENDING)
+  if (nwrite != ERR_IO_PENDING) {
+    if (nwrite < 0)
+      net_log_.AddEventWithNetErrorCode(NetLog::TYPE_UDP_SEND_ERROR, nwrite);

[Sergey Ulanov, 2011/10/14 20:15:47]

move this to InternalSendTo()

[mmenke, 2011/10/17 17:35:20]

Done.

     return nwrite;
+  }
 
+  if (address)
+    send_to_address_.reset(new IPEndPoint(*address));
   write_iobuffer_ = buf;
   write_callback_ = callback;
   return ERR_IO_PENDING;
 }
 
 int UDPSocketWin::Connect(const IPEndPoint& address) {
+  net_log_.BeginEvent(
+      NetLog::TYPE_UDP_CONNECT,
+      make_scoped_refptr(new NetLogStringParameter("address",
+                                                   address.ToString())));
+  int rv = InternalConnect(address);
+  net_log_.EndEventWithNetErrorCode(NetLog::TYPE_UDP_CONNECT, rv);
+  return rv;
+}
+
+int UDPSocketWin::InternalConnect(const IPEndPoint& address) {
   DCHECK(!is_connected());
   DCHECK(!remote_address_.get());
   int rv = CreateSocket(address);
@@ -266,26 +287,47 @@
   WSAResetEvent(read_overlapped_.hEvent);
   int result = ok ? num_bytes : MapSystemError(WSAGetLastError());
   if (ok) {
-    if (!ProcessSuccessfulRead(num_bytes, recv_from_address_))
+    if (!ProcessSuccessfulRead(num_bytes, read_iobuffer_->data(),
+                               recv_from_address_)) {
       result = ERR_FAILED;
+    }
   }
+  if (result < 0)
+    net_log_.AddEventWithNetErrorCode(NetLog::TYPE_UDP_RECEIVE_ERROR, result);
   read_iobuffer_ = NULL;
   recv_from_address_ = NULL;
   DoReadCallback(result);
 }
 
-bool UDPSocketWin::ProcessSuccessfulRead(int num_bytes, IPEndPoint* address) {
+bool UDPSocketWin::ProcessSuccessfulRead(int num_bytes, const char* bytes,
+                                         IPEndPoint* address) const {
   base::StatsCounter read_bytes("udp.read_bytes");
   read_bytes.Add(num_bytes);
 
+  const struct sockaddr* addr =
+      reinterpret_cast<const struct sockaddr*>(&recv_addr_storage_);
+
   // Convert address.
   if (address) {
-    struct sockaddr* addr =
-        reinterpret_cast<struct sockaddr*>(&recv_addr_storage_);
     if (!address->FromSockAddr(addr, recv_addr_len_))
       return false;
   }
 
+  if (net_log_.IsLoggingAllEvents()) {
+    // Get address for logging, if |address| is NULL.
+    IPEndPoint address_on_stack;
+    if (!address) {
+      if (address_on_stack.FromSockAddr(addr, recv_addr_len_))
+        address = &address_on_stack;
+    }
+    net_log_.AddEvent(
+        NetLog::TYPE_UDP_BYTES_RECEIVED,
+        make_scoped_refptr(
+            new UDPDataTransferNetLogParam(num_bytes, bytes,
+                                           net_log_.IsLoggingBytes(),
+                                           address)));
+  }
+
   return true;
 }
 
@@ -295,13 +337,28 @@
                                    &num_bytes, FALSE, &flags);
   WSAResetEvent(write_overlapped_.hEvent);
   int result = ok ? num_bytes : MapSystemError(WSAGetLastError());
-  if (ok)
-    ProcessSuccessfulWrite(num_bytes);
+  if (ok) {
+    ProcessSuccessfulWrite(num_bytes, write_iobuffer_->data(),
+                           send_to_address_.get());
+  } else {
+    net_log_.AddEventWithNetErrorCode(NetLog::TYPE_UDP_SEND_ERROR, result);
+  }
+  send_to_address_.reset();
   write_iobuffer_ = NULL;
   DoWriteCallback(result);
 }
 
-void UDPSocketWin::ProcessSuccessfulWrite(int num_bytes) {
+void UDPSocketWin::ProcessSuccessfulWrite(int num_bytes,
+                                          const char* bytes,
+                                          const IPEndPoint* address) const {
+  if (net_log_.IsLoggingAllEvents()) {
+    net_log_.AddEvent(
+        NetLog::TYPE_UDP_BYTES_SENT,
+        make_scoped_refptr(
+            new UDPDataTransferNetLogParam(num_bytes, bytes,
+                                           net_log_.IsLoggingBytes(),
+                                           address)));
+  }
   base::StatsCounter write_bytes("udp.write_bytes");
   write_bytes.Add(num_bytes);
 }
@@ -323,7 +380,7 @@
                        &recv_addr_len_, &read_overlapped_, NULL);
   if (rv == 0) {
     if (ResetEventIfSignaled(read_overlapped_.hEvent)) {
-      if (!ProcessSuccessfulRead(num, address))
+      if (!ProcessSuccessfulRead(num, buf->data(), address))
         return ERR_FAILED;
       return static_cast<int>(num);
     }
@@ -362,7 +419,7 @@
                      addr, addr_len, &write_overlapped_, NULL);
   if (rv == 0) {
     if (ResetEventIfSignaled(write_overlapped_.hEvent)) {
-      ProcessSuccessfulWrite(num);
+      ProcessSuccessfulWrite(num, buf->data(), address);
       return static_cast<int>(num);
     }
   } else {