generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update talk to 61549749.

Browse Source 
TBR=wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/8709004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5549 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mallinath@webrtc.org
2014-02-14 00:56:12 +00:00
parent b9a088b920
commit 385857dfd4
56 changed files with 370 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
talk/p2p/base/p2ptransportchannel.cc
View File

@@ -795,7 +795,7 @@ int P2PTransportChannel::SetOption(talk_base::Socket::Option opt, int value) {
// Send data to the other side, using our best connection.
int P2PTransportChannel::SendPacket(const char *data, size_t len,
talk_base::DiffServCodePoint dscp,
const talk_base::PacketOptions& options,
int flags) {
ASSERT(worker_thread_ == talk_base::Thread::Current());
if (flags != 0) {
@@ -807,7 +807,7 @@ int P2PTransportChannel::SendPacket(const char *data, size_t len,
return -1;
}
int sent = best_connection_->Send(data, len, dscp);
int sent = best_connection_->Send(data, len, options);
if (sent <= 0) {
ASSERT(sent < 0);
error_ = best_connection_->GetError();
@@ -1010,8 +1010,10 @@ void P2PTransportChannel::UpdateChannelState() {
bool readable = false;
for (uint32 i = 0; i < connections_.size(); ++i) {
if (connections_[i]->read_state() == Connection::STATE_READABLE)
if (connections_[i]->read_state() == Connection::STATE_READABLE) {
readable = true;
break;
}
}
set_readable(readable);
}
@@ -1224,6 +1226,8 @@ void P2PTransportChannel::OnConnectionDestroyed(Connection* connection) {
SwitchBestConnectionTo(NULL);
RequestSort();
}
SignalConnectionRemoved(this);
}
// When a port is destroyed remove it from our list of ports to use for