Use IPEndPoint for P2P IPC messages

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/6685013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77923 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 65 insertions, 91 deletions

diff --git a/content/browser/renderer_host/p2p_socket_host.h b/content/browser/renderer_host/p2p_socket_host.h
index 6d8656c..b7cd919 100644
--- a/content/browser/renderer_host/p2p_socket_host.h
+++ b/content/browser/renderer_host/p2p_socket_host.h
@@ -7,6 +7,8 @@
 
 #include "content/common/p2p_sockets.h"
 
+#include "net/base/ip_endpoint.h"
+
 class P2PSocketsHost;
 
 // Base class for P2P sockets used by P2PSocketsHost.
@@ -23,7 +25,7 @@ class P2PSocketHost {
   virtual bool Init() = 0;
 
   // Sends |data| on the socket to |socket_address|.
-  virtual void Send(const P2PSocketAddress& socket_address,
+  virtual void Send(const net::IPEndPoint& socket_address,
                     const std::vector<char>& data) = 0;
 
  protected:
diff --git a/content/browser/renderer_host/p2p_socket_host_posix.cc b/content/browser/renderer_host/p2p_socket_host_posix.cc
index e7a804b..eb1f8b3 100644
--- a/content/browser/renderer_host/p2p_socket_host_posix.cc
+++ b/content/browser/renderer_host/p2p_socket_host_posix.cc
@@ -71,34 +71,6 @@ bool GetLocalAddress(sockaddr_in* addr) {
   return found;
 }
 
-bool SocketAddressToSockAddr(const P2PSocketAddress& address,
-                             sockaddr_in* addr) {
-  // TODO(sergeyu): Add IPv6 support.
-  if (address.address.size() != 4) {
-    return false;
-  }
-
-  addr->sin_family = AF_INET;
-  memcpy(&addr->sin_addr, &address.address[0], 4);
-  addr->sin_port = htons(address.port);
-  return true;
-}
-
-bool SockAddrToSocketAddress(sockaddr_in* addr,
-                             P2PSocketAddress* address) {
-  if (addr->sin_family != AF_INET) {
-    LOG(ERROR) << "SockAddrToSocketAddress: only IPv4 addresses are supported";
-    // TODO(sergeyu): Add IPv6 support.
-    return false;
-  }
-
-  address->address.resize(4);
-  memcpy(&address->address[0], &addr->sin_addr, 4);
-  address->port = ntohs(addr->sin_port);
-
-  return true;
-}
-
 }  // namespace
 
 P2PSocketHostPosix::P2PSocketHostPosix(
@@ -161,16 +133,14 @@ bool P2PSocketHostPosix::Init() {
     return false;
   }
 
-  P2PSocketAddress address;
-  if (!SockAddrToSocketAddress(&addr, &address)) {
+  net::IPEndPoint address;
+  if (!address.FromSockAddr(reinterpret_cast<sockaddr*>(&addr), addrlen)) {
     OnError();
     return false;
   }
 
   VLOG(1) << "getsockname() returned "
-          << net::NetAddressToString(
-              reinterpret_cast<sockaddr*>(&addr), sizeof(addr))
-          << ":" << address.port;
+          << address.ToString();
 
   state_ = STATE_OPEN;
 
@@ -196,24 +166,24 @@ void P2PSocketHostPosix::DidCompleteRead() {
 
   std::vector<char> data;
   data.resize(4096);
-  sockaddr_in addr;
-  socklen_t addr_len = sizeof(addr);
-  int result = recvfrom(socket_, &data[0], data.size(), 0,
-                          reinterpret_cast<sockaddr*>(&addr), &addr_len);
+  sockaddr_storage addr_storage;
+  sockaddr* addr = reinterpret_cast<sockaddr*>(&addr_storage);
+  socklen_t addr_len = sizeof(addr_storage);
+  int result = recvfrom(socket_, &data[0], data.size(), 0, addr, &addr_len);
   if (result > 0) {
     data.resize(result);
-    VLOG(2) << "received " << result << " bytes from "
-            << net::NetAddressToString(
-                reinterpret_cast<sockaddr*>(&addr), sizeof(addr))
-            << ":" << ntohs(addr.sin_port);
-    P2PSocketAddress address;
-    if (!SockAddrToSocketAddress(&addr, &address)) {
-      // Address conversion fails only if we receive a non-IPv4
-      // packet, which should never happen because the socket is IPv4.
+
+    net::IPEndPoint address;
+    if (!address.FromSockAddr(addr, addr_len) ||
+        address.GetFamily() != AF_INET) {
+      // We should never receive IPv6 packet on IPv4 packet.
       NOTREACHED();
       return;
     }
 
+    VLOG(2) << "received " << result << " bytes from "
+            << address.ToString();
+
     host_->Send(new P2PMsg_OnDataReceived(routing_id_, id_,
                                                address, data));
   } else if (result < 0) {
@@ -222,19 +192,18 @@ void P2PSocketHostPosix::DidCompleteRead() {
   }
 }
 
-void P2PSocketHostPosix::Send(const P2PSocketAddress& socket_address,
+void P2PSocketHostPosix::Send(const net::IPEndPoint& socket_address,
                               const std::vector<char>& data) {
-  sockaddr_in addr;
-  SocketAddressToSockAddr(socket_address, &addr);
-  int result = sendto(socket_, &data[0], data.size(), 0,
-                      reinterpret_cast<sockaddr*>(&addr), sizeof(addr));
+  sockaddr_storage addr_storage;
+  sockaddr* addr = reinterpret_cast<sockaddr*>(&addr_storage);
+  size_t addr_len = sizeof(addr_storage);
+  socket_address.ToSockAddr(addr, &addr_len);
+  int result = sendto(socket_, &data[0], data.size(), 0, addr, addr_len);
   if (result < 0) {
     LOG(ERROR) << "Send failed.";
   } else {
     VLOG(2) << "Sent " << result << " bytes to "
-            << net::NetAddressToString(
-                reinterpret_cast<sockaddr*>(&addr), sizeof(addr))
-            << ":" <<  ntohs(addr.sin_port);
+            << socket_address.ToString();
   }
 }
 
diff --git a/content/browser/renderer_host/p2p_socket_host_posix.h b/content/browser/renderer_host/p2p_socket_host_posix.h
index 236c24d..855d7ee 100644
--- a/content/browser/renderer_host/p2p_socket_host_posix.h
+++ b/content/browser/renderer_host/p2p_socket_host_posix.h
@@ -16,7 +16,7 @@ class P2PSocketHostPosix : public P2PSocketHost {
   virtual ~P2PSocketHostPosix();
 
   virtual bool Init();
-  virtual void Send(const P2PSocketAddress& socket_address,
+  virtual void Send(const net::IPEndPoint& socket_address,
                     const std::vector<char>& data);
 
  private:
diff --git a/content/browser/renderer_host/p2p_sockets_host.cc b/content/browser/renderer_host/p2p_sockets_host.cc
index bf1c880..8cc2843 100644
--- a/content/browser/renderer_host/p2p_sockets_host.cc
+++ b/content/browser/renderer_host/p2p_sockets_host.cc
@@ -41,7 +41,7 @@ bool P2PSocketsHost::OnMessageReceived(const IPC::Message& message,
 
 void P2PSocketsHost::OnCreateSocket(
     const IPC::Message& msg, P2PSocketType type, int socket_id,
-    const P2PSocketAddress& remote_address) {
+    const net::IPEndPoint& remote_address) {
   if (sockets_.Lookup(socket_id)) {
     LOG(ERROR) << "Received P2PHostMsg_CreateSocket for socket "
         "that already exists.";
@@ -67,7 +67,7 @@ void P2PSocketsHost::OnCreateSocket(
 }
 
 void P2PSocketsHost::OnSend(const IPC::Message& msg, int socket_id,
-                            const P2PSocketAddress& socket_address,
+                            const net::IPEndPoint& socket_address,
                             const std::vector<char>& data) {
   P2PSocketHost* socket = sockets_.Lookup(socket_id);
   if (!socket) {
diff --git a/content/browser/renderer_host/p2p_sockets_host.h b/content/browser/renderer_host/p2p_sockets_host.h
index 37ec8fd..32757d0 100644
--- a/content/browser/renderer_host/p2p_sockets_host.h
+++ b/content/browser/renderer_host/p2p_sockets_host.h
@@ -8,6 +8,7 @@
 #include "base/id_map.h"
 #include "content/browser/browser_message_filter.h"
 #include "content/common/p2p_sockets.h"
+#include "net/base/ip_endpoint.h"
 
 class P2PSocketHost;
 
@@ -24,9 +25,9 @@ class P2PSocketsHost : public BrowserMessageFilter {
 
  private:
   void OnCreateSocket(const IPC::Message& msg, P2PSocketType type,
-                      int socket_id, const P2PSocketAddress& remote_address);
+                      int socket_id, const net::IPEndPoint& remote_address);
   void OnSend(const IPC::Message& msg, int socket_id,
-              const P2PSocketAddress& socket_address,
+              const net::IPEndPoint& socket_address,
               const std::vector<char>& data);
   void OnDestroySocket(const IPC::Message& msg, int socket_id);
 
diff --git a/content/common/common_param_traits.cc b/content/common/common_param_traits.cc
index 948576b..4570559 100644
--- a/content/common/common_param_traits.cc
+++ b/content/common/common_param_traits.cc
@@ -316,6 +316,25 @@ void ParamTraits<scoped_refptr<net::HttpResponseHeaders> >::Log(
   l->append("<HttpResponseHeaders>");
 }
 
+void ParamTraits<net::IPEndPoint>::Write(Message* m, const param_type& p) {
+  WriteParam(m, p.address());
+  WriteParam(m, p.port());
+}
+
+bool ParamTraits<net::IPEndPoint>::Read(const Message* m, void** iter,
+                                        param_type* p) {
+  net::IPAddressNumber address;
+  int port;
+  if (!ReadParam(m, iter, &address) || !ReadParam(m, iter, &port))
+    return false;
+  *p = net::IPEndPoint(address, port);
+  return true;
+}
+
+void ParamTraits<net::IPEndPoint>::Log(const param_type& p, std::string* l) {
+  LogParam("IPEndPoint:" + p.ToString(), l);
+}
+
 void ParamTraits<webkit_glue::ResourceLoadTimingInfo>::Write(
     Message* m, const param_type& p) {
   WriteParam(m, p.base_time.is_null());
diff --git a/content/common/common_param_traits.h b/content/common/common_param_traits.h
index 20c5be3..2448377 100644
--- a/content/common/common_param_traits.h
+++ b/content/common/common_param_traits.h
@@ -18,6 +18,7 @@
 #include "base/ref_counted.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_utils.h"
+#include "net/base/ip_endpoint.h"
 #include "net/url_request/url_request_status.h"
 // !!! WARNING: DO NOT ADD NEW WEBKIT DEPENDENCIES !!!
 //
@@ -101,6 +102,14 @@ struct ParamTraits<scoped_refptr<net::HttpResponseHeaders> > {
 };
 
 template <>
+struct ParamTraits<net::IPEndPoint> {
+  typedef net::IPEndPoint param_type;
+  static void Write(Message* m, const param_type& p);
+  static bool Read(const Message* m, void** iter, param_type* p);
+  static void Log(const param_type& p, std::string* l);
+};
+
+template <>
 struct ParamTraits<webkit_glue::ResourceLoadTimingInfo> {
   typedef webkit_glue::ResourceLoadTimingInfo param_type;
   static void Write(Message* m, const param_type& p);
diff --git a/content/common/p2p_messages.h b/content/common/p2p_messages.h
index 8424fe1..36935af 100644
--- a/content/common/p2p_messages.h
+++ b/content/common/p2p_messages.h
@@ -7,28 +7,24 @@
 
 #include "content/common/p2p_sockets.h"
 #include "ipc/ipc_message_macros.h"
+#include "net/base/ip_endpoint.h"
 
 #define IPC_MESSAGE_START P2PMsgStart
 
-IPC_STRUCT_TRAITS_BEGIN(P2PSocketAddress)
-  IPC_STRUCT_TRAITS_MEMBER(address)
-  IPC_STRUCT_TRAITS_MEMBER(port)
-IPC_STRUCT_TRAITS_END()
-
 IPC_ENUM_TRAITS(P2PSocketType)
 
 // P2P Socket messages sent from the browser to the renderer.
 
 IPC_MESSAGE_ROUTED2(P2PMsg_OnSocketCreated,
                     int /* socket_id */,
-                    P2PSocketAddress /* socket_address */)
+                    net::IPEndPoint /* socket_address */)
 
 IPC_MESSAGE_ROUTED1(P2PMsg_OnError,
                     int /* socket_id */)
 
 IPC_MESSAGE_ROUTED3(P2PMsg_OnDataReceived,
                     int /* socket_id */,
-                    P2PSocketAddress /* socket_address */,
+                    net::IPEndPoint /* socket_address */,
                     std::vector<char> /* data */)
 
 // P2P Socket messages sent from the renderer to the browser.
@@ -36,13 +32,13 @@ IPC_MESSAGE_ROUTED3(P2PMsg_OnDataReceived,
 IPC_MESSAGE_ROUTED3(P2PHostMsg_CreateSocket,
                     P2PSocketType /* type */,
                     int /* socket_id */,
-                    P2PSocketAddress /* remote_address */)
+                    net::IPEndPoint /* remote_address */)
 
 // TODO(sergeyu): Use shared memory to pass the data.
 IPC_MESSAGE_ROUTED3(P2PHostMsg_Send,
                     int /* socket_id */,
-                    P2PSocketAddress /* socket_address */,
+                    net::IPEndPoint /* socket_address */,
                     std::vector<char> /* data */)
 
 IPC_MESSAGE_ROUTED1(P2PHostMsg_DestroySocket,
-                     int /* socket_id */)
+                    int /* socket_id */)
diff --git a/content/common/p2p_sockets.cc b/content/common/p2p_sockets.cc
deleted file mode 100644
index 6223848..0000000
--- a/content/common/p2p_sockets.cc
+++ /dev/null
@@ -1,11 +0,0 @@
-// 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/common/p2p_sockets.h"
-
-P2PSocketAddress::P2PSocketAddress() : port(0) {
-}
-
-P2PSocketAddress::~P2PSocketAddress() {
-}
diff --git a/content/common/p2p_sockets.h b/content/common/p2p_sockets.h
index 3c44fd8..d775683 100644
--- a/content/common/p2p_sockets.h
+++ b/content/common/p2p_sockets.h
@@ -8,16 +8,6 @@
 #ifndef CONTENT_COMMON_P2P_SOCKETS_H_
 #define CONTENT_COMMON_P2P_SOCKETS_H_
 
-#include "net/base/net_util.h"
-
-// Pair of IP address and port number.
-struct P2PSocketAddress {
-  P2PSocketAddress();
-  ~P2PSocketAddress();
-  net::IPAddressNumber address;
-  int port;
-};
-
 // Type of P2P Socket.
 enum P2PSocketType {
   P2P_SOCKET_UDP,
diff --git a/content/content_common.gypi b/content/content_common.gypi
index cd62bd3..cd1784b 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -73,7 +73,6 @@
         'common/notification_source.h',
         'common/notification_type.h',
         'common/p2p_messages.h',
-        'common/p2p_sockets.cc',
         'common/p2p_sockets.h',
         'common/property_bag.cc',
         'common/property_bag.h',