summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DEPS2
-rw-r--r--content/renderer/p2p/ipc_socket_factory.cc12
-rw-r--r--jingle/glue/channel_socket_adapter.cc7
-rw-r--r--jingle/glue/channel_socket_adapter_unittest.cc8
-rw-r--r--jingle/glue/fake_socket_factory.cc6
-rw-r--r--jingle/glue/fake_socket_factory.h4
-rw-r--r--remoting/client/plugin/pepper_packet_socket_factory.cc8
-rw-r--r--remoting/jingle_glue/chromium_socket_factory.cc8
-rw-r--r--remoting/jingle_glue/chromium_socket_factory_unittest.cc4
9 files changed, 29 insertions, 30 deletions
diff --git a/DEPS b/DEPS
index c456be3..e2e581c 100644
--- a/DEPS
+++ b/DEPS
@@ -54,7 +54,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling WebRTC
# and V8 without interference from each other.
- "webrtc_revision": "5548",
+ "webrtc_revision": "5549",
"jsoncpp_revision": "248",
"nss_revision": "246067",
# Three lines of non-changing comments so that
diff --git a/content/renderer/p2p/ipc_socket_factory.cc b/content/renderer/p2p/ipc_socket_factory.cc
index 971243b..16e2641 100644
--- a/content/renderer/p2p/ipc_socket_factory.cc
+++ b/content/renderer/p2p/ipc_socket_factory.cc
@@ -78,10 +78,10 @@ class IpcPacketSocket : public talk_base::AsyncPacketSocket,
virtual talk_base::SocketAddress GetLocalAddress() const OVERRIDE;
virtual talk_base::SocketAddress GetRemoteAddress() const OVERRIDE;
virtual int Send(const void *pv, size_t cb,
- talk_base::DiffServCodePoint dscp) OVERRIDE;
+ const talk_base::PacketOptions& options) OVERRIDE;
virtual int SendTo(const void *pv, size_t cb,
const talk_base::SocketAddress& addr,
- talk_base::DiffServCodePoint dscp) OVERRIDE;
+ const talk_base::PacketOptions& options) OVERRIDE;
virtual int Close() OVERRIDE;
virtual State GetState() const OVERRIDE;
virtual int GetOption(talk_base::Socket::Option option, int* value) OVERRIDE;
@@ -243,14 +243,14 @@ talk_base::SocketAddress IpcPacketSocket::GetRemoteAddress() const {
}
int IpcPacketSocket::Send(const void *data, size_t data_size,
- talk_base::DiffServCodePoint dscp) {
+ const talk_base::PacketOptions& options) {
DCHECK_EQ(base::MessageLoop::current(), message_loop_);
- return SendTo(data, data_size, remote_address_, dscp);
+ return SendTo(data, data_size, remote_address_, options);
}
int IpcPacketSocket::SendTo(const void *data, size_t data_size,
const talk_base::SocketAddress& address,
- talk_base::DiffServCodePoint dscp) {
+ const talk_base::PacketOptions& options) {
DCHECK_EQ(base::MessageLoop::current(), message_loop_);
switch (state_) {
@@ -297,7 +297,7 @@ int IpcPacketSocket::SendTo(const void *data, size_t data_size,
const char* data_char = reinterpret_cast<const char*>(data);
std::vector<char> data_vector(data_char, data_char + data_size);
client_->SendWithDscp(address_chrome, data_vector,
- static_cast<net::DiffServCodePoint>(dscp));
+ static_cast<net::DiffServCodePoint>(options.dscp));
// Fake successful send. The caller ignores result anyway.
return data_size;
diff --git a/jingle/glue/channel_socket_adapter.cc b/jingle/glue/channel_socket_adapter.cc
index c9cfff1..40ed12c 100644
--- a/jingle/glue/channel_socket_adapter.cc
+++ b/jingle/glue/channel_socket_adapter.cc
@@ -76,9 +76,9 @@ int TransportChannelSocketAdapter::Write(
}
int result;
+ talk_base::PacketOptions options;
if (channel_->writable()) {
- result = channel_->SendPacket(buffer->data(), buffer_size,
- talk_base::DSCP_NO_CHANGE);
+ result = channel_->SendPacket(buffer->data(), buffer_size, options);
if (result < 0) {
result = net::MapSystemError(channel_->GetError());
@@ -172,9 +172,10 @@ void TransportChannelSocketAdapter::OnWritableState(
DCHECK_EQ(base::MessageLoop::current(), message_loop_);
// Try to send the packet if there is a pending write.
if (!write_callback_.is_null()) {
+ talk_base::PacketOptions options;
int result = channel_->SendPacket(write_buffer_->data(),
write_buffer_size_,
- talk_base::DSCP_NO_CHANGE);
+ options);
if (result < 0)
result = net::MapSystemError(channel_->GetError());
diff --git a/jingle/glue/channel_socket_adapter_unittest.cc b/jingle/glue/channel_socket_adapter_unittest.cc
index 7fcb5d1..436f8f7 100644
--- a/jingle/glue/channel_socket_adapter_unittest.cc
+++ b/jingle/glue/channel_socket_adapter_unittest.cc
@@ -36,7 +36,7 @@ class MockTransportChannel : public cricket::TransportChannel {
MOCK_METHOD4(SendPacket, int(const char* data,
size_t len,
- talk_base::DiffServCodePoint dscp,
+ const talk_base::PacketOptions& options,
int flags));
MOCK_METHOD2(SetOption, int(talk_base::Socket::Option opt, int value));
MOCK_METHOD0(GetError, int());
@@ -111,8 +111,7 @@ TEST_F(TransportChannelSocketAdapterTest, ReadClose) {
TEST_F(TransportChannelSocketAdapterTest, Write) {
scoped_refptr<IOBuffer> buffer(new IOBuffer(kTestDataSize));
- EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize,
- talk_base::DSCP_NO_CHANGE, 0))
+ EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize, _, 0))
.WillOnce(Return(kTestDataSize));
int result = target_->Write(buffer.get(), kTestDataSize, callback_);
@@ -124,8 +123,7 @@ TEST_F(TransportChannelSocketAdapterTest, Write) {
TEST_F(TransportChannelSocketAdapterTest, WritePending) {
scoped_refptr<IOBuffer> buffer(new IOBuffer(kTestDataSize));
- EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize,
- talk_base::DSCP_NO_CHANGE, 0))
+ EXPECT_CALL(channel_, SendPacket(buffer->data(), kTestDataSize, _, 0))
.Times(1)
.WillOnce(Return(SOCKET_ERROR));
diff --git a/jingle/glue/fake_socket_factory.cc b/jingle/glue/fake_socket_factory.cc
index 38472c6..570c22f 100644
--- a/jingle/glue/fake_socket_factory.cc
+++ b/jingle/glue/fake_socket_factory.cc
@@ -35,14 +35,14 @@ talk_base::SocketAddress FakeUDPPacketSocket::GetRemoteAddress() const {
}
int FakeUDPPacketSocket::Send(const void *data, size_t data_size,
- talk_base::DiffServCodePoint dscp) {
+ const talk_base::PacketOptions& options) {
DCHECK(CalledOnValidThread());
- return SendTo(data, data_size, remote_address_, dscp);
+ return SendTo(data, data_size, remote_address_, options);
}
int FakeUDPPacketSocket::SendTo(const void *data, size_t data_size,
const talk_base::SocketAddress& address,
- talk_base::DiffServCodePoint dscp) {
+ const talk_base::PacketOptions& options) {
DCHECK(CalledOnValidThread());
if (state_ == IS_CLOSED) {
diff --git a/jingle/glue/fake_socket_factory.h b/jingle/glue/fake_socket_factory.h
index e9af78d..b46cdc6 100644
--- a/jingle/glue/fake_socket_factory.h
+++ b/jingle/glue/fake_socket_factory.h
@@ -39,10 +39,10 @@ class FakeUDPPacketSocket : public talk_base::AsyncPacketSocket,
virtual talk_base::SocketAddress GetLocalAddress() const OVERRIDE;
virtual talk_base::SocketAddress GetRemoteAddress() const OVERRIDE;
virtual int Send(const void *pv, size_t cb,
- talk_base::DiffServCodePoint dscp) OVERRIDE;
+ const talk_base::PacketOptions& options) OVERRIDE;
virtual int SendTo(const void *pv, size_t cb,
const talk_base::SocketAddress& addr,
- talk_base::DiffServCodePoint dscp) OVERRIDE;
+ const talk_base::PacketOptions& options) OVERRIDE;
virtual int Close() OVERRIDE;
virtual State GetState() const OVERRIDE;
virtual int GetOption(talk_base::Socket::Option opt, int* value) OVERRIDE;
diff --git a/remoting/client/plugin/pepper_packet_socket_factory.cc b/remoting/client/plugin/pepper_packet_socket_factory.cc
index ba738d6..90d7c61 100644
--- a/remoting/client/plugin/pepper_packet_socket_factory.cc
+++ b/remoting/client/plugin/pepper_packet_socket_factory.cc
@@ -41,11 +41,11 @@ class UdpPacketSocket : public talk_base::AsyncPacketSocket {
virtual talk_base::SocketAddress GetLocalAddress() const OVERRIDE;
virtual talk_base::SocketAddress GetRemoteAddress() const OVERRIDE;
virtual int Send(const void* data, size_t data_size,
- talk_base::DiffServCodePoint dscp) OVERRIDE;
+ const talk_base::PacketOptions& options) OVERRIDE;
virtual int SendTo(const void* data,
size_t data_size,
const talk_base::SocketAddress& address,
- talk_base::DiffServCodePoint dscp) OVERRIDE;
+ const talk_base::PacketOptions& options) OVERRIDE;
virtual int Close() OVERRIDE;
virtual State GetState() const OVERRIDE;
virtual int GetOption(talk_base::Socket::Option opt, int* value) OVERRIDE;
@@ -193,7 +193,7 @@ talk_base::SocketAddress UdpPacketSocket::GetRemoteAddress() const {
}
int UdpPacketSocket::Send(const void* data, size_t data_size,
- talk_base::DiffServCodePoint dscp) {
+ const talk_base::PacketOptions& options) {
// UDP sockets are not connected - this method should never be called.
NOTREACHED();
return EWOULDBLOCK;
@@ -202,7 +202,7 @@ int UdpPacketSocket::Send(const void* data, size_t data_size,
int UdpPacketSocket::SendTo(const void* data,
size_t data_size,
const talk_base::SocketAddress& address,
- talk_base::DiffServCodePoint dscp) {
+ const talk_base::PacketOptions& options) {
if (state_ != STATE_BOUND) {
// TODO(sergeyu): StunPort may try to send stun request before we
// are bound. Fix that problem and change this to DCHECK.
diff --git a/remoting/jingle_glue/chromium_socket_factory.cc b/remoting/jingle_glue/chromium_socket_factory.cc
index 4c2a4b8..24cda6e 100644
--- a/remoting/jingle_glue/chromium_socket_factory.cc
+++ b/remoting/jingle_glue/chromium_socket_factory.cc
@@ -47,10 +47,10 @@ class UdpPacketSocket : public talk_base::AsyncPacketSocket {
virtual talk_base::SocketAddress GetLocalAddress() const OVERRIDE;
virtual talk_base::SocketAddress GetRemoteAddress() const OVERRIDE;
virtual int Send(const void* data, size_t data_size,
- talk_base::DiffServCodePoint dscp) OVERRIDE;
+ const talk_base::PacketOptions& options) OVERRIDE;
virtual int SendTo(const void* data, size_t data_size,
const talk_base::SocketAddress& address,
- talk_base::DiffServCodePoint dscp) OVERRIDE;
+ const talk_base::PacketOptions& options) OVERRIDE;
virtual int Close() OVERRIDE;
virtual State GetState() const OVERRIDE;
virtual int GetOption(talk_base::Socket::Option option, int* value) OVERRIDE;
@@ -163,7 +163,7 @@ talk_base::SocketAddress UdpPacketSocket::GetRemoteAddress() const {
}
int UdpPacketSocket::Send(const void* data, size_t data_size,
- talk_base::DiffServCodePoint dscp) {
+ const talk_base::PacketOptions& options) {
// UDP sockets are not connected - this method should never be called.
NOTREACHED();
return EWOULDBLOCK;
@@ -171,7 +171,7 @@ int UdpPacketSocket::Send(const void* data, size_t data_size,
int UdpPacketSocket::SendTo(const void* data, size_t data_size,
const talk_base::SocketAddress& address,
- talk_base::DiffServCodePoint dscp) {
+ const talk_base::PacketOptions& options) {
if (state_ != STATE_BOUND) {
NOTREACHED();
return EINVAL;
diff --git a/remoting/jingle_glue/chromium_socket_factory_unittest.cc b/remoting/jingle_glue/chromium_socket_factory_unittest.cc
index 621c6bb..9e233f3 100644
--- a/remoting/jingle_glue/chromium_socket_factory_unittest.cc
+++ b/remoting/jingle_glue/chromium_socket_factory_unittest.cc
@@ -65,10 +65,10 @@ TEST_F(ChromiumSocketFactoryTest, SendAndReceive) {
std::string test_packet("TEST PACKET");
int attempts = 0;
+ talk_base::PacketOptions options;
while (last_packet_.empty() && attempts++ < kMaxAttempts) {
sending_socket->SendTo(test_packet.data(), test_packet.size(),
- socket_->GetLocalAddress(),
- talk_base::DSCP_NO_CHANGE);
+ socket_->GetLocalAddress(), options);
message_loop_.PostDelayedTask(FROM_HERE, run_loop_.QuitClosure(),
kAttemptPeriod);
run_loop_.Run();
generated by cgit v1.1 at 2025-01-26 12:36:19 +0000