| Index: content/common/p2p_messages.h
|
| diff --git a/content/common/p2p_messages.h b/content/common/p2p_messages.h
|
| index 8424fe153a2b107b42cb4bde0e8cdce3cda1f997..36935af83a58f8723bb19b596568f21fe9f2dd04 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 */)
|
|
|