diff options
| author | mallinath@chromium.org <mallinath@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-23 23:11:57 +0000 |
|---|---|---|
| committer | mallinath@chromium.org <mallinath@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-23 23:11:57 +0000 |
| commit | 7791cf4320968b5d1fde781626dbbf0cf96b8ab5 (patch) | |
| tree | 1302a7a907fdec9122c1690b0988966da390a0f3 /remoting/jingle_glue | |
| parent | 6ef08fe1cbf13b0fa2498d7354a95a58ee317338 (diff) | |
| download | chromium_src-7791cf4320968b5d1fde781626dbbf0cf96b8ab5.zip chromium_src-7791cf4320968b5d1fde781626dbbf0cf96b8ab5.tar.gz chromium_src-7791cf4320968b5d1fde781626dbbf0cf96b8ab5.tar.bz2 | |
Update webrtc to r4819.
R=ronghuawu@chromium.org, sergeyu@chromium.org
Review URL: https://codereview.chromium.org/24364005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224826 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/jingle_glue')
| -rw-r--r-- | remoting/jingle_glue/chromium_socket_factory.cc | 16 | ||||
| -rw-r--r-- | remoting/jingle_glue/chromium_socket_factory_unittest.cc | 3 |
2 files changed, 14 insertions, 5 deletions
diff --git a/remoting/jingle_glue/chromium_socket_factory.cc b/remoting/jingle_glue/chromium_socket_factory.cc index d894087..f95dff3 100644 --- a/remoting/jingle_glue/chromium_socket_factory.cc +++ b/remoting/jingle_glue/chromium_socket_factory.cc @@ -45,9 +45,11 @@ class UdpPacketSocket : public talk_base::AsyncPacketSocket { // 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 @@ talk_base::SocketAddress UdpPacketSocket::GetRemoteAddress() const { 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 @@ int UdpPacketSocket::SetOption(talk_base::Socket::Option option, int value) { case talk_base::Socket::OPT_IPV6_V6ONLY: NOTIMPLEMENTED(); return -1; + + case talk_base::Socket::OPT_DSCP: + NOTIMPLEMENTED(); + return -1; } NOTREACHED(); diff --git a/remoting/jingle_glue/chromium_socket_factory_unittest.cc b/remoting/jingle_glue/chromium_socket_factory_unittest.cc index 4af8e77..29375e7 100644 --- a/remoting/jingle_glue/chromium_socket_factory_unittest.cc +++ b/remoting/jingle_glue/chromium_socket_factory_unittest.cc @@ -66,7 +66,8 @@ TEST_F(ChromiumSocketFactoryTest, SendAndReceive) { int attempts = 0; while (last_packet_.empty() && attempts++ < kMaxAttempts) { sending_socket->SendTo(test_packet.data(), test_packet.size(), - socket_->GetLocalAddress()); + socket_->GetLocalAddress(), + talk_base::DSCP_NO_CHANGE); message_loop_.PostDelayedTask(FROM_HERE, run_loop_.QuitClosure(), kAttemptPeriod); run_loop_.Run(); |