Skip to content

Commit

Permalink
Roll webrtc to r5549. Major change in this revision is addition of Pa…
Browse files Browse the repository at this point in the history 
…cketOptions structure to every packet sent over network in AsyncPacketSocket::Send methods.

This structure has information about parameters required for packet authentication outside libsrtp.

R=ronghuawu@chromium.org, sergeyu@chromium.org

Review URL: https://codereview.chromium.org/167893002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251548 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
mallinath@chromium.org committed Feb 15, 2014
1 parent 178277c commit e6b239a
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 30 deletions.
2 changes: 1 addition & 1 deletion DEPS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions content/renderer/p2p/ipc_socket_factory.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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_) {
Expand Down Expand Up @@ -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;
Expand Down
7 changes: 4 additions & 3 deletions jingle/glue/channel_socket_adapter.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down Expand Up @@ -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());

Expand Down
8 changes: 3 additions & 5 deletions jingle/glue/channel_socket_adapter_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down Expand Up @@ -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_);
Expand All @@ -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));

Expand Down
6 changes: 3 additions & 3 deletions jingle/glue/fake_socket_factory.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions jingle/glue/fake_socket_factory.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions remoting/client/plugin/pepper_packet_socket_factory.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions remoting/jingle_glue/chromium_socket_factory.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -163,15 +163,15 @@ 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;
}

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;
Expand Down
4 changes: 2 additions & 2 deletions remoting/jingle_glue/chromium_socket_factory_unittest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down

0 comments on commit e6b239a

Please sign in to comment.