admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

When all connections timed out on writing, delete them all.

Browse Source 
BUG=5111

Review URL: https://codereview.webrtc.org/1421123003

Cr-Commit-Position: refs/heads/master@{#10431}
This commit is contained in:
honghaiz 2015-10-27 11:34:45 -07:00 committed by Commit bot
parent f116bd0d7a
commit 77d0d6e858
3 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/p2p/base/p2ptransportchannel.cc
View File

@ -1112,9 +1112,11 @@ void P2PTransportChannel::HandleNotWritable() {
}
}
// If all connections timed out, delete them all.
void P2PTransportChannel::HandleAllTimedOut() {
// Currently we are treating this as channel not writable.
HandleNotWritable();
for (Connection* connection : connections_) {
connection->Destroy();
}
}
bool P2PTransportChannel::weak() const {

3
webrtc/p2p/base/p2ptransportchannel.h
View File

@ -158,6 +158,9 @@ class P2PTransportChannel : public TransportChannelImpl,
// Public for unit tests.
Connection* FindNextPingableConnection();
// Public for unit tests.
const std::vector<Connection*>& connections() const { return connections_; }
private:
rtc::Thread* thread() { return worker_thread_; }
PortAllocatorSession* allocator_session() {

31
webrtc/p2p/base/p2ptransportchannel_unittest.cc
View File

@ -2159,3 +2159,34 @@ TEST_F(P2PTransportChannelPingTest, TestConnectionPrunedAgain) {
EXPECT_TRUE_WAIT(!conn2->active(), 1000);
EXPECT_EQ(cricket::TransportChannelState::STATE_COMPLETED, ch.GetState());
}
// Test that if all connections in a channel has timed out on writing, they
// will all be deleted. We use Prune to simulate write_time_out.
TEST_F(P2PTransportChannelPingTest, TestDeleteConnectionsIfAllWriteTimedout) {
cricket::FakePortAllocator pa(rtc::Thread::Current(), nullptr);
cricket::P2PTransportChannel ch("test channel", 1, nullptr, &pa);
PrepareChannel(&ch);
ch.Connect();
ch.MaybeStartGathering();
// Have one connection only but later becomes write-time-out.
ch.AddRemoteCandidate(CreateCandidate("1.1.1.1", 1, 100));
cricket::Connection* conn1 = WaitForConnectionTo(&ch, "1.1.1.1", 1);
ASSERT_TRUE(conn1 != nullptr);
conn1->ReceivedPing(); // Becomes receiving
conn1->Prune();
EXPECT_TRUE_WAIT(ch.connections().empty(), 1000);
// Have two connections but both become write-time-out later.
ch.AddRemoteCandidate(CreateCandidate("2.2.2.2", 2, 1));
cricket::Connection* conn2 = WaitForConnectionTo(&ch, "2.2.2.2", 2);
ASSERT_TRUE(conn2 != nullptr);
conn2->ReceivedPing(); // Becomes receiving
ch.AddRemoteCandidate(CreateCandidate("3.3.3.3", 3, 2));
cricket::Connection* conn3 = WaitForConnectionTo(&ch, "3.3.3.3", 3);
ASSERT_TRUE(conn3 != nullptr);
conn3->ReceivedPing(); // Becomes receiving
// Now prune both conn2 and conn3; they will be deleted soon.
conn2->Prune();
conn3->Prune();
EXPECT_TRUE_WAIT(ch.connections().empty(), 1000);
}