| Index: content/browser/renderer_host/p2p/socket_host_udp.h
|
| diff --git a/content/browser/renderer_host/p2p/socket_host_udp.h b/content/browser/renderer_host/p2p/socket_host_udp.h
|
| index e9eb36393f4d5fe6c4561999e5ad4fc57b1403a1..359e353a5f73bedc83857c6b8213d2cd6c28be0a 100644
|
| --- a/content/browser/renderer_host/p2p/socket_host_udp.h
|
| +++ b/content/browser/renderer_host/p2p/socket_host_udp.h
|
| @@ -30,7 +30,8 @@ class CONTENT_EXPORT P2PSocketHostUdp : public P2PSocketHost {
|
| virtual bool Init(const net::IPEndPoint& local_address,
|
| const net::IPEndPoint& remote_address) OVERRIDE;
|
| virtual void Send(const net::IPEndPoint& to,
|
| - const std::vector<char>& data) OVERRIDE;
|
| + const std::vector<char>& data,
|
| + net::DiffServCodePoint dscp) OVERRIDE;
|
| virtual P2PSocketHost* AcceptIncomingTcpConnection(
|
| const net::IPEndPoint& remote_address, int id) OVERRIDE;
|
|
|
| @@ -42,12 +43,14 @@ class CONTENT_EXPORT P2PSocketHostUdp : public P2PSocketHost {
|
| struct PendingPacket {
|
| PendingPacket(const net::IPEndPoint& to,
|
| const std::vector<char>& content,
|
| - uint64 id);
|
| + uint64 id,
|
| + net::DiffServCodePoint dscp);
|
| ~PendingPacket();
|
| net::IPEndPoint to;
|
| scoped_refptr<net::IOBuffer> data;
|
| int size;
|
| uint64 id;
|
| + net::DiffServCodePoint dscp;
|
| };
|
|
|
| void OnError();
|
| @@ -60,13 +63,14 @@ class CONTENT_EXPORT P2PSocketHostUdp : public P2PSocketHost {
|
| void OnSend(uint64 packet_id, int result);
|
| void HandleSendResult(uint64 packet_id, int result);
|
|
|
| - scoped_ptr<net::DatagramServerSocket> socket_;
|
| + scoped_ptr<net::UDPServerSocket> socket_;
|
| scoped_refptr<net::IOBuffer> recv_buffer_;
|
| net::IPEndPoint recv_address_;
|
|
|
| std::deque<PendingPacket> send_queue_;
|
| bool send_pending_;
|
| uint64 send_packet_count_;
|
| + net::DiffServCodePoint last_dscp_;
|
|
|
| // Set of peer for which we have received STUN binding request or
|
| // response or relay allocation request or response.
|
|
|