Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/p2p/base/p2ptransportchannel_unittest.cc

Issue 2025573002: Use continual gathering to restore backup connections (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Merge branch 'master' into enhanced_cg Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« webrtc/p2p/base/p2ptransportchannel.cc ('K') | « webrtc/p2p/base/p2ptransportchannel.cc ('k') | webrtc/p2p/base/port.h » ('j') | webrtc/p2p/base/port.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/p2p/base/p2ptransportchannel_unittest.cc
diff --git a/webrtc/p2p/base/p2ptransportchannel_unittest.cc b/webrtc/p2p/base/p2ptransportchannel_unittest.cc
index c51098ad54a3cd4e985bb3fc2535a7f6acfbe1a8..02aef2b8284eb5c5c51a2e5d0c70fb8389750851 100644
--- a/webrtc/p2p/base/p2ptransportchannel_unittest.cc
+++ b/webrtc/p2p/base/p2ptransportchannel_unittest.cc
@@ -105,12 +105,13 @@ static const uint64_t kTiebreaker2 = 22222;
enum { MSG_ADD_CANDIDATES, MSG_REMOVE_CANDIDATES };
-cricket::IceConfig CreateIceConfig(int receiving_timeout,
- bool gather_continually,
- int backup_ping_interval = -1) {
+cricket::IceConfig CreateIceConfig(
+ int receiving_timeout,
+ cricket::ContinualGatheringPolicy continual_gathering_policy,
+ int backup_ping_interval = -1) {
cricket::IceConfig config;
config.receiving_timeout = receiving_timeout;
- config.gather_continually = gather_continually;
+ config.continual_gathering_policy = continual_gathering_policy;
config.backup_connection_ping_interval = backup_ping_interval;
return config;
}
@@ -412,6 +413,7 @@ class P2PTransportChannelTestBase : public testing::Test,
}
void RemoveAddress(int endpoint, const SocketAddress& addr) {
GetEndpoint(endpoint)->network_manager_.RemoveInterface(addr);
+ fw()->AddRule(false, rtc::FP_ANY, rtc::FD_ANY, addr);
}
void SetProxy(int endpoint, rtc::ProxyType type) {
rtc::ProxyInfo info;
@@ -1561,7 +1563,7 @@ TEST_F(P2PTransportChannelTest, TestContinualGathering) {
SetAllocationStepDelay(0, kDefaultStepDelay);
SetAllocationStepDelay(1, kDefaultStepDelay);
CreateChannels(1);
- IceConfig config = CreateIceConfig(1000, true);
+ IceConfig config = CreateIceConfig(1000, GATHER_CONTINUALLY);
ep1_ch1()->SetIceConfig(config);
// By default, ep2 does not gather continually.
@@ -1832,6 +1834,37 @@ TEST_F(P2PTransportChannelSameNatTest, TestConesBehindSameCone) {
// In the future we will try different RTTs and configs for the different
// interfaces, so that we can simulate a user with Ethernet and VPN networks.
class P2PTransportChannelMultihomedTest : public P2PTransportChannelTestBase {
+ public:
+ const cricket::Connection* GetConnectionWithRemoteAddress(
+ cricket::P2PTransportChannel* channel,
+ const SocketAddress& address) {
+ for (cricket::Connection* conn : channel->connections()) {
+ if (conn->remote_candidate().address().EqualIPs(address)) {
+ return conn;
+ }
+ }
+ return nullptr;
+ }
+
+ const cricket::Connection* GetConnectionWithLocalAddress(
+ cricket::P2PTransportChannel* channel,
+ const SocketAddress& address) {
+ for (cricket::Connection* conn : channel->connections()) {
+ if (conn->local_candidate().address().EqualIPs(address)) {
+ return conn;
+ }
+ }
+ return nullptr;
+ }
+
+ void DestroyAllButBestConnection(cricket::P2PTransportChannel* channel) {
+ const cricket::Connection* best_connection = channel->best_connection();
+ for (cricket::Connection* conn : channel->connections()) {
+ if (conn != best_connection) {
+ conn->Destroy();
+ }
+ }
+ }
};
// Test that we can establish connectivity when both peers are multihomed.
@@ -1868,7 +1901,7 @@ TEST_F(P2PTransportChannelMultihomedTest, TestFailoverControlledSide) {
RemoteCandidate(ep1_ch1())->address().EqualIPs(kPublicAddrs[1]));
// Make the receiving timeout shorter for testing.
- IceConfig config = CreateIceConfig(1000, false);
+ IceConfig config = CreateIceConfig(1000, GATHER_ONCE);
ep1_ch1()->SetIceConfig(config);
ep2_ch1()->SetIceConfig(config);
@@ -1921,7 +1954,7 @@ TEST_F(P2PTransportChannelMultihomedTest, TestFailoverControllingSide) {
RemoteCandidate(ep1_ch1())->address().EqualIPs(kPublicAddrs[1]));
// Make the receiving timeout shorter for testing.
- IceConfig config = CreateIceConfig(1000, false);
+ IceConfig config = CreateIceConfig(1000, GATHER_ONCE);
ep1_ch1()->SetIceConfig(config);
ep2_ch1()->SetIceConfig(config);
@@ -1980,6 +2013,7 @@ TEST_F(P2PTransportChannelMultihomedTest, TestPreferWifiToWifiConnection) {
LocalCandidate(ep2_ch1())->address().EqualIPs(wifi[1]) &&
RemoteCandidate(ep2_ch1())->address().EqualIPs(wifi[0]),
1000);
+ DestroyChannels();
}
// Tests that a Wifi-Cellular connection has higher precedence than
@@ -2010,6 +2044,7 @@ TEST_F(P2PTransportChannelMultihomedTest, TestPreferWifiOverCellularNetwork) {
EXPECT_TRUE_WAIT(ep2_ch1()->selected_connection() &&
LocalCandidate(ep2_ch1())->address().EqualIPs(wifi[1]),
1000);
+ DestroyChannels();
}
// Test that the backup connection is pinged at a rate no faster than
@@ -2031,7 +2066,8 @@ TEST_F(P2PTransportChannelMultihomedTest, TestPingBackupConnectionRate) {
ep2_ch1()->receiving() && ep2_ch1()->writable(),
1000, 1000);
int backup_ping_interval = 2000;
- ep2_ch1()->SetIceConfig(CreateIceConfig(2000, false, backup_ping_interval));
+ ep2_ch1()->SetIceConfig(
+ CreateIceConfig(2000, GATHER_ONCE, backup_ping_interval));
// After the state becomes COMPLETED, the backup connection will be pinged
// once every |backup_ping_interval| milliseconds.
ASSERT_TRUE_WAIT(ep2_ch1()->GetState() == STATE_COMPLETED, 1000);
@@ -2046,6 +2082,8 @@ TEST_F(P2PTransportChannelMultihomedTest, TestPingBackupConnectionRate) {
backup_conn->last_ping_response_received() - last_ping_response_ms;
LOG(LS_INFO) << "Time elapsed: " << time_elapsed;
EXPECT_GE(time_elapsed, backup_ping_interval);
+
+ DestroyChannels();
}
TEST_F(P2PTransportChannelMultihomedTest, TestGetState) {
@@ -2062,23 +2100,25 @@ TEST_F(P2PTransportChannelMultihomedTest, TestGetState) {
1000);
}
-// Tests that when a network interface becomes inactive, if and only if
-// Continual Gathering is enabled, the ports associated with that network
+// Tests that when a network interface becomes inactive, if Continual Gathering
+// policy is GATHER_CONTINUALLY, the ports associated with that network
// will be removed from the port list of the channel, and the respective
// remote candidates on the other participant will be removed eventually.
TEST_F(P2PTransportChannelMultihomedTest, TestNetworkBecomesInactive) {
+ rtc::ScopedFakeClock clock;
AddAddress(0, kPublicAddrs[0]);
AddAddress(1, kPublicAddrs[1]);
// Create channels and let them go writable, as usual.
CreateChannels(1);
- ep1_ch1()->SetIceConfig(CreateIceConfig(2000, true));
- ep2_ch1()->SetIceConfig(CreateIceConfig(2000, false));
+ ep1_ch1()->SetIceConfig(CreateIceConfig(2000, GATHER_CONTINUALLY));
+ ep2_ch1()->SetIceConfig(CreateIceConfig(2000, GATHER_ONCE));
SetAllocatorFlags(0, kOnlyLocalPorts);
SetAllocatorFlags(1, kOnlyLocalPorts);
- EXPECT_TRUE_WAIT_MARGIN(ep1_ch1()->receiving() && ep1_ch1()->writable() &&
- ep2_ch1()->receiving() && ep2_ch1()->writable(),
- 1000, 1000);
+ EXPECT_TRUE_SIMULATED_WAIT(ep1_ch1()->receiving() && ep1_ch1()->writable() &&
+ ep2_ch1()->receiving() &&
+ ep2_ch1()->writable(),
+ kDefaultTimeout, clock);
// More than one port has been created.
EXPECT_LE(1U, ep1_ch1()->ports().size());
// Endpoint 1 enabled continual gathering; the port will be removed
@@ -2086,29 +2126,73 @@ TEST_F(P2PTransportChannelMultihomedTest, TestNetworkBecomesInactive) {
RemoveAddress(0, kPublicAddrs[0]);
EXPECT_TRUE(ep1_ch1()->ports().empty());
// The remote candidates will be removed eventually.
- EXPECT_TRUE_WAIT(ep2_ch1()->remote_candidates().empty(), 1000);
+ EXPECT_TRUE_SIMULATED_WAIT(ep2_ch1()->remote_candidates().empty(), 1000,
+ clock);
size_t num_ports = ep2_ch1()->ports().size();
EXPECT_LE(1U, num_ports);
size_t num_remote_candidates = ep1_ch1()->remote_candidates().size();
- // Endpoint 2 did not enable continual gathering; the port will not be removed
- // when the interface is removed and neither the remote candidates on the
- // other participant.
+ // Endpoint 2 did not enable continual gathering; the local port will still be
+ // removed when the interface is removed but the remote candidates on the
+ // other participant will not be removed.
RemoveAddress(1, kPublicAddrs[1]);
- rtc::Thread::Current()->ProcessMessages(500);
- EXPECT_EQ(num_ports, ep2_ch1()->ports().size());
+
+ EXPECT_EQ_SIMULATED_WAIT(0U, ep2_ch1()->ports().size(), kDefaultTimeout,
+ clock);
+ SIMULATED_WAIT(0U == ep1_ch1()->remote_candidates().size(), 500, clock);
EXPECT_EQ(num_remote_candidates, ep1_ch1()->remote_candidates().size());
+
+ DestroyChannels();
}
-/*
+// Tests that continual gathering will create new connections when a new
+// interface is added.
+TEST_F(P2PTransportChannelMultihomedTest,
+ TestContinualGatheringOnNewInterface) {
+ auto& wifi = kAlternateAddrs;
+ auto& cellular = kPublicAddrs;
+ AddAddress(0, wifi[0], "test_wifi0", rtc::ADAPTER_TYPE_WIFI);
+ AddAddress(1, cellular[1], "test_cell1", rtc::ADAPTER_TYPE_CELLULAR);
+ CreateChannels(1);
+ // Enable continual gathering.
+ ep1_ch1()->SetIceConfig(CreateIceConfig(1000, GATHER_CONTINUALLY));
+ ep2_ch1()->SetIceConfig(CreateIceConfig(1000, GATHER_CONTINUALLY));
+ SetAllocatorFlags(0, kOnlyLocalPorts);
+ SetAllocatorFlags(1, kOnlyLocalPorts);
+ EXPECT_TRUE_WAIT_MARGIN(ep1_ch1()->receiving() && ep1_ch1()->writable() &&
+ ep2_ch1()->receiving() && ep2_ch1()->writable(),
+ kDefaultTimeout, kDefaultTimeout);
+
+ // Add a new wifi interface on end point 2. We should expect a new connection
+ // to be created and the new one will be the best connection.
+ AddAddress(1, wifi[1], "test_wifi1", rtc::ADAPTER_TYPE_WIFI);
+ const cricket::Connection* conn;
+ EXPECT_TRUE_WAIT((conn = ep1_ch1()->best_connection()) != nullptr &&
+ conn->remote_candidate().address().EqualIPs(wifi[1]),
+ kDefaultTimeout);
+ EXPECT_TRUE_WAIT((conn = ep2_ch1()->best_connection()) != nullptr &&
+ conn->local_candidate().address().EqualIPs(wifi[1]),
+ kDefaultTimeout);
-TODO(pthatcher): Once have a way to handle network interfaces changes
-without signalling an ICE restart, put a test like this back. In the
-mean time, this test only worked for GICE. With ICE, it's currently
-not possible without an ICE restart.
+ // Add a new cellular interface on end point 1, we should expect a new
+ // backup connection created using this new interface.
+ AddAddress(0, cellular[0], "test_cellular0", rtc::ADAPTER_TYPE_CELLULAR);
+ EXPECT_TRUE_WAIT(
+ ep1_ch1()->GetState() == cricket::STATE_COMPLETED &&
+ (conn = GetConnectionWithLocalAddress(ep1_ch1(), cellular[0])) &&
+ conn != ep1_ch1()->best_connection() && conn->writable(),
+ kDefaultTimeout);
+ EXPECT_TRUE_WAIT(
+ ep2_ch1()->GetState() == cricket::STATE_COMPLETED &&
+ (conn = GetConnectionWithRemoteAddress(ep2_ch1(), cellular[0])) &&
+ conn != ep2_ch1()->best_connection() && conn->receiving(),
+ kDefaultTimeout);
-// Test that we can switch links in a coordinated fashion.
-TEST_F(P2PTransportChannelMultihomedTest, TestDrain) {
+ DestroyChannels();
+}
+
+// Tests that we can switch links via continual gathering.
+TEST_F(P2PTransportChannelMultihomedTest, TestContinualGatheringSwitchLinks) {
AddAddress(0, kPublicAddrs[0]);
AddAddress(1, kPublicAddrs[1]);
// Use only local ports for simplicity.
@@ -2117,35 +2201,120 @@ TEST_F(P2PTransportChannelMultihomedTest, TestDrain) {
// Create channels and let them go writable, as usual.
CreateChannels(1);
- EXPECT_TRUE_WAIT(ep1_ch1()->receiving() && ep1_ch1()->writable() &&
- ep2_ch1()->receiving() && ep2_ch1()->writable(),
- 1000);
+ // Enable continual gathering.
+ ep1_ch1()->SetIceConfig(CreateIceConfig(1000, GATHER_CONTINUALLY));
+ ep2_ch1()->SetIceConfig(CreateIceConfig(1000, GATHER_CONTINUALLY));
+ EXPECT_TRUE_WAIT_MARGIN(ep1_ch1()->receiving() && ep1_ch1()->writable() &&
+ ep2_ch1()->receiving() && ep2_ch1()->writable(),
+ kDefaultTimeout, kDefaultTimeout);
EXPECT_TRUE(
ep1_ch1()->selected_connection() && ep2_ch1()->selected_connection() &&
LocalCandidate(ep1_ch1())->address().EqualIPs(kPublicAddrs[0]) &&
RemoteCandidate(ep1_ch1())->address().EqualIPs(kPublicAddrs[1]));
-
- // Remove the public interface, add the alternate interface, and allocate
- // a new generation of candidates for the new interface (via
- // MaybeStartGathering()).
+ // Add the new address first and then remove the other one.
LOG(LS_INFO) << "Draining...";
AddAddress(1, kAlternateAddrs[1]);
RemoveAddress(1, kPublicAddrs[1]);
- ep2_ch1()->MaybeStartGathering();
-
- // We should switch over to use the alternate address after
- // an exchange of pings.
+ // We should switch to use the alternate address after an exchange of pings.
EXPECT_TRUE_WAIT(
ep1_ch1()->selected_connection() && ep2_ch1()->selected_connection() &&
LocalCandidate(ep1_ch1())->address().EqualIPs(kPublicAddrs[0]) &&
RemoteCandidate(ep1_ch1())->address().EqualIPs(kAlternateAddrs[1]),
3000);
+ // Remove one address first and then add another address.
+ LOG(LS_INFO) << "Draining again...";
+ RemoveAddress(1, kAlternateAddrs[1]);
+ AddAddress(1, kAlternateAddrs[0]);
+ EXPECT_TRUE_WAIT(
+ ep1_ch1()->best_connection() && ep2_ch1()->best_connection() &&
+ LocalCandidate(ep1_ch1())->address().EqualIPs(kPublicAddrs[0]) &&
+ RemoteCandidate(ep1_ch1())->address().EqualIPs(kAlternateAddrs[0]),
+ 3000);
+
+ DestroyChannels();
+}
+
+// Tests that if the backup connections are lost and then the interface with the
+// selected connection is gone, continual gathering will restore the
+// connectivity.
+TEST_F(P2PTransportChannelMultihomedTest,
+ TestBackupConnectionLostThenContinualGathering) {
+ auto& wifi = kAlternateAddrs;
+ auto& cellular = kPublicAddrs;
+ AddAddress(0, wifi[0], "test_wifi0", rtc::ADAPTER_TYPE_WIFI);
+ AddAddress(0, cellular[0], "test_cell0", rtc::ADAPTER_TYPE_CELLULAR);
+ AddAddress(1, wifi[1], "test_wifi1", rtc::ADAPTER_TYPE_WIFI);
+ AddAddress(1, cellular[1], "test_cell1", rtc::ADAPTER_TYPE_CELLULAR);
+ // Use only local ports for simplicity.
+ SetAllocatorFlags(0, kOnlyLocalPorts);
+ SetAllocatorFlags(1, kOnlyLocalPorts);
+
+ // Create channels and let them go writable, as usual.
+ CreateChannels(1);
+ // Enable continual gathering.
+ ep1_ch1()->SetIceConfig(CreateIceConfig(1000, GATHER_CONTINUALLY));
+ ep2_ch1()->SetIceConfig(CreateIceConfig(1000, GATHER_CONTINUALLY));
+ EXPECT_TRUE_WAIT_MARGIN(ep1_ch1()->receiving() && ep1_ch1()->writable() &&
+ ep2_ch1()->receiving() && ep2_ch1()->writable(),
+ kDefaultTimeout, kDefaultTimeout);
+ EXPECT_TRUE(ep1_ch1()->best_connection() && ep2_ch1()->best_connection() &&
+ LocalCandidate(ep1_ch1())->address().EqualIPs(wifi[0]) &&
+ RemoteCandidate(ep1_ch1())->address().EqualIPs(wifi[1]));
+
+ // First destroy all backup connection.
+ DestroyAllButBestConnection(ep1_ch1());
+ // Then the interface of the best connection goes away.
+ RemoveAddress(0, wifi[0]);
+ EXPECT_TRUE_WAIT(
+ ep1_ch1()->best_connection() && ep2_ch1()->best_connection() &&
+ LocalCandidate(ep1_ch1())->address().EqualIPs(cellular[0]) &&
+ RemoteCandidate(ep1_ch1())->address().EqualIPs(wifi[1]),
+ kDefaultTimeout);
+
DestroyChannels();
}
-*/
+// Tests that the backup connection will be restored after it is destroyed.
+TEST_F(P2PTransportChannelMultihomedTest, TestRestoreBackupConnection) {
+ auto& wifi = kAlternateAddrs;
+ auto& cellular = kPublicAddrs;
+ AddAddress(0, wifi[0], "test_wifi0", rtc::ADAPTER_TYPE_WIFI);
+ AddAddress(0, cellular[0], "test_cell0", rtc::ADAPTER_TYPE_CELLULAR);
+ AddAddress(1, wifi[1], "test_wifi1", rtc::ADAPTER_TYPE_WIFI);
+ AddAddress(1, cellular[1], "test_cell1", rtc::ADAPTER_TYPE_CELLULAR);
+ // Use only local ports for simplicity.
+ SetAllocatorFlags(0, kOnlyLocalPorts);
+ SetAllocatorFlags(1, kOnlyLocalPorts);
+
+ // Create channels and let them go writable, as usual.
+ CreateChannels(1);
+ IceConfig config = CreateIceConfig(1000, GATHER_CONTINUALLY);
+ config.regather_on_failed_networks_interval = 2000;
+ ep1_ch1()->SetIceConfig(config);
+ ep2_ch1()->SetIceConfig(config);
+ EXPECT_TRUE_WAIT_MARGIN(ep1_ch1()->receiving() && ep1_ch1()->writable() &&
+ ep2_ch1()->receiving() && ep2_ch1()->writable(),
+ kDefaultTimeout, kDefaultTimeout);
+ EXPECT_TRUE(ep1_ch1()->best_connection() && ep2_ch1()->best_connection() &&
+ LocalCandidate(ep1_ch1())->address().EqualIPs(wifi[0]) &&
+ RemoteCandidate(ep1_ch1())->address().EqualIPs(wifi[1]));
+
+ // Destroy all backup connections.
+ DestroyAllButBestConnection(ep1_ch1());
+ // Ensure the backup connection is removed first.
+ EXPECT_TRUE_WAIT(
+ GetConnectionWithLocalAddress(ep1_ch1(), cellular[0]) == nullptr,
+ kDefaultTimeout);
+ const cricket::Connection* conn;
+ EXPECT_TRUE_WAIT(
+ (conn = GetConnectionWithLocalAddress(ep1_ch1(), cellular[0])) &&
+ conn != ep1_ch1()->best_connection() && conn->writable(),
+ 5000);
+
+ DestroyChannels();
+}
// A collection of tests which tests a single P2PTransportChannel by sending
// pings.
@@ -2603,7 +2772,7 @@ TEST_F(P2PTransportChannelPingTest, TestReceivingStateChange) {
// small.
EXPECT_LE(1000, ch.receiving_timeout());
EXPECT_LE(200, ch.check_receiving_interval());
- ch.SetIceConfig(CreateIceConfig(500, false));
+ ch.SetIceConfig(CreateIceConfig(500, GATHER_ONCE));
EXPECT_EQ(500, ch.receiving_timeout());
EXPECT_EQ(50, ch.check_receiving_interval());
ch.Connect();
@@ -3026,7 +3195,7 @@ TEST_F(P2PTransportChannelPingTest, TestDontPruneWhenWeak) {
conn2->SignalNominated(conn2);
EXPECT_TRUE_WAIT(conn1->pruned(), 3000);
- ch.SetIceConfig(CreateIceConfig(500, false));
+ ch.SetIceConfig(CreateIceConfig(500, GATHER_ONCE));
// Wait until conn2 becomes not receiving.
EXPECT_TRUE_WAIT(!conn2->receiving(), 3000);
@@ -3094,7 +3263,7 @@ TEST_F(P2PTransportChannelPingTest, TestConnectionPrunedAgain) {
FakePortAllocator pa(rtc::Thread::Current(), nullptr);
P2PTransportChannel ch("test channel", 1, &pa);
PrepareChannel(&ch);
- ch.SetIceConfig(CreateIceConfig(1000, false));
+ ch.SetIceConfig(CreateIceConfig(1000, GATHER_ONCE));
ch.Connect();
ch.MaybeStartGathering();
ch.AddRemoteCandidate(CreateUdpCandidate(LOCAL_PORT_TYPE, "1.1.1.1", 1, 100));
@@ -3170,7 +3339,7 @@ TEST_F(P2PTransportChannelPingTest, TestStopPortAllocatorSessions) {
FakePortAllocator pa(rtc::Thread::Current(), nullptr);
P2PTransportChannel ch("test channel", 1, &pa);
PrepareChannel(&ch);
- ch.SetIceConfig(CreateIceConfig(2000, false));
+ ch.SetIceConfig(CreateIceConfig(2000, GATHER_ONCE));
ch.Connect();
ch.MaybeStartGathering();
ch.AddRemoteCandidate(CreateUdpCandidate(LOCAL_PORT_TYPE, "1.1.1.1", 1, 100));
@@ -3197,17 +3366,15 @@ TEST_F(P2PTransportChannelPingTest, TestStopPortAllocatorSessions) {
EXPECT_TRUE(!ch.allocator_session()->IsGettingPorts());
}
-// Test that the ICE role is updated even on ports with inactive networks when
-// doing continual gathering. These ports may still have connections that need
-// a correct role, in case the network becomes active before the connection is
-// destroyed.
-TEST_F(P2PTransportChannelPingTest,
- TestIceRoleUpdatedOnPortAfterSignalNetworkInactive) {
+// Test that the ICE role is updated even on ports that has been removed.
+// These ports may still have connections that need a correct role, in case that
+// the connections on it may still receive stun pings.
+TEST_F(P2PTransportChannelPingTest, TestIceRoleUpdatedOnRemovedPort) {
FakePortAllocator pa(rtc::Thread::Current(), nullptr);
P2PTransportChannel ch("test channel", ICE_CANDIDATE_COMPONENT_DEFAULT, &pa);
// Starts with ICEROLE_CONTROLLING.
PrepareChannel(&ch);
- IceConfig config = CreateIceConfig(1000, true);
+ IceConfig config = CreateIceConfig(1000, GATHER_CONTINUALLY);
ch.SetIceConfig(config);
ch.Connect();
ch.MaybeStartGathering();
@@ -3216,9 +3383,10 @@ TEST_F(P2PTransportChannelPingTest,
Connection* conn = WaitForConnectionTo(&ch, "1.1.1.1", 1);
ASSERT_TRUE(conn != nullptr);
- // Make the fake port signal that its network is inactive, then change the
- // ICE role and expect it to be updated.
- conn->port()->SignalNetworkInactive(conn->port());
+ // Make a fake signal to remove the ports in the p2ptransportchannel. then
+ // change the ICE role and expect it to be updated.
+ std::vector<PortInterface*> ports(1, conn->port());
+ ch.allocator_session()->SignalPortsRemoved(ch.allocator_session(), ports);
ch.SetIceRole(ICEROLE_CONTROLLED);
EXPECT_EQ(ICEROLE_CONTROLLED, conn->port()->GetIceRole());
}
« webrtc/p2p/base/p2ptransportchannel.cc ('K') | « webrtc/p2p/base/p2ptransportchannel.cc ('k') | webrtc/p2p/base/port.h » ('j') | webrtc/p2p/base/port.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698