| Index: remoting/jingle_glue/chromium_socket_factory.cc
|
| ===================================================================
|
| --- remoting/jingle_glue/chromium_socket_factory.cc (revision 224785)
|
| +++ remoting/jingle_glue/chromium_socket_factory.cc (working copy)
|
| @@ -45,9 +45,11 @@
|
| // talk_base::AsyncPacketSocket interface.
|
| virtual talk_base::SocketAddress GetLocalAddress() const OVERRIDE;
|
| virtual talk_base::SocketAddress GetRemoteAddress() const OVERRIDE;
|
| - virtual int Send(const void* data, size_t data_size) OVERRIDE;
|
| + virtual int Send(const void* data, size_t data_size,
|
| + talk_base::DiffServCodePoint dscp) OVERRIDE;
|
| virtual int SendTo(const void* data, size_t data_size,
|
| - const talk_base::SocketAddress& address) OVERRIDE;
|
| + const talk_base::SocketAddress& address,
|
| + talk_base::DiffServCodePoint dscp) OVERRIDE;
|
| virtual int Close() OVERRIDE;
|
| virtual State GetState() const OVERRIDE;
|
| virtual int GetOption(talk_base::Socket::Option option, int* value) OVERRIDE;
|
| @@ -159,14 +161,16 @@
|
| return talk_base::SocketAddress();
|
| }
|
|
|
| -int UdpPacketSocket::Send(const void* data, size_t data_size) {
|
| +int UdpPacketSocket::Send(const void* data, size_t data_size,
|
| + talk_base::DiffServCodePoint dscp) {
|
| // UDP sockets are not connected - this method should never be called.
|
| NOTREACHED();
|
| return EWOULDBLOCK;
|
| }
|
|
|
| int UdpPacketSocket::SendTo(const void* data, size_t data_size,
|
| - const talk_base::SocketAddress& address) {
|
| + const talk_base::SocketAddress& address,
|
| + talk_base::DiffServCodePoint dscp) {
|
| if (state_ != STATE_BOUND) {
|
| NOTREACHED();
|
| return EINVAL;
|
| @@ -237,6 +241,10 @@
|
| case talk_base::Socket::OPT_IPV6_V6ONLY:
|
| NOTIMPLEMENTED();
|
| return -1;
|
| +
|
| + case talk_base::Socket::OPT_DSCP:
|
| + NOTIMPLEMENTED();
|
| + return -1;
|
| }
|
|
|
| NOTREACHED();
|
|
|