Delete enum RelayType and classes RelayPort and RelayServer. See also PSA: https://groups.google.com/forum/?#!msg/discuss-webrtc/0ROpUXpw3Gs/eikIN-eEBwAJROpUXpw3Gs/eikIN-eEBwAJ Bug: webrtc:10998 Change-Id: I1eab760dc73df9156cd1224cf99ad4a4c12ed882 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/154522 Reviewed-by: Justin Uberti <juberti@webrtc.org> Reviewed-by: Tommi <tommi@webrtc.org> Commit-Queue: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#29677}
309 lines
13 KiB
C++
309 lines
13 KiB
C++
/*
|
|
* Copyright 2018 The WebRTC Project Authors. All rights reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "p2p/base/regathering_controller.h"
|
|
|
|
#include <map>
|
|
#include <memory>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "api/scoped_refptr.h"
|
|
#include "p2p/base/fake_port_allocator.h"
|
|
#include "p2p/base/mock_ice_transport.h"
|
|
#include "p2p/base/p2p_constants.h"
|
|
#include "p2p/base/port.h"
|
|
#include "p2p/base/stun_server.h"
|
|
#include "rtc_base/gunit.h"
|
|
#include "rtc_base/ref_counted_object.h"
|
|
#include "rtc_base/socket_address.h"
|
|
#include "rtc_base/thread.h"
|
|
#include "rtc_base/virtual_socket_server.h"
|
|
|
|
namespace {
|
|
|
|
const int kOnlyLocalPorts = cricket::PORTALLOCATOR_DISABLE_STUN |
|
|
cricket::PORTALLOCATOR_DISABLE_RELAY |
|
|
cricket::PORTALLOCATOR_DISABLE_TCP;
|
|
// The address of the public STUN server.
|
|
const rtc::SocketAddress kStunAddr("99.99.99.1", cricket::STUN_SERVER_PORT);
|
|
// The addresses for the public TURN server.
|
|
const rtc::SocketAddress kTurnUdpIntAddr("99.99.99.3",
|
|
cricket::STUN_SERVER_PORT);
|
|
const cricket::RelayCredentials kRelayCredentials("test", "test");
|
|
const char kIceUfrag[] = "UF00";
|
|
const char kIcePwd[] = "TESTICEPWD00000000000000";
|
|
|
|
} // namespace
|
|
|
|
namespace webrtc {
|
|
|
|
class RegatheringControllerTest : public ::testing::Test,
|
|
public sigslot::has_slots<> {
|
|
public:
|
|
RegatheringControllerTest()
|
|
: vss_(new rtc::VirtualSocketServer()),
|
|
thread_(vss_.get()),
|
|
ice_transport_(new cricket::MockIceTransport()),
|
|
allocator_(
|
|
new cricket::FakePortAllocator(rtc::Thread::Current(), nullptr)) {
|
|
BasicRegatheringController::Config regathering_config(absl::nullopt, 0);
|
|
regathering_controller_.reset(new BasicRegatheringController(
|
|
regathering_config, ice_transport_.get(), rtc::Thread::Current()));
|
|
}
|
|
|
|
// Initializes the allocator and gathers candidates once by StartGettingPorts.
|
|
void InitializeAndGatherOnce() {
|
|
cricket::ServerAddresses stun_servers;
|
|
stun_servers.insert(kStunAddr);
|
|
cricket::RelayServerConfig turn_server;
|
|
turn_server.credentials = kRelayCredentials;
|
|
turn_server.ports.push_back(
|
|
cricket::ProtocolAddress(kTurnUdpIntAddr, cricket::PROTO_UDP));
|
|
std::vector<cricket::RelayServerConfig> turn_servers(1, turn_server);
|
|
allocator_->set_flags(kOnlyLocalPorts);
|
|
allocator_->SetConfiguration(stun_servers, turn_servers, 0 /* pool size */,
|
|
webrtc::NO_PRUNE);
|
|
allocator_session_ = allocator_->CreateSession(
|
|
"test", cricket::ICE_CANDIDATE_COMPONENT_RTP, kIceUfrag, kIcePwd);
|
|
// The gathering will take place on the current thread and the following
|
|
// call of StartGettingPorts is blocking. We will not ClearGettingPorts
|
|
// prematurely.
|
|
allocator_session_->StartGettingPorts();
|
|
allocator_session_->SignalIceRegathering.connect(
|
|
this, &RegatheringControllerTest::OnIceRegathering);
|
|
regathering_controller_->set_allocator_session(allocator_session_.get());
|
|
}
|
|
|
|
// The regathering controller is initialized with the allocator session
|
|
// cleared. Only after clearing the session, we would be able to regather. See
|
|
// the comments for BasicRegatheringController in regatheringcontroller.h.
|
|
void InitializeAndGatherOnceWithSessionCleared() {
|
|
InitializeAndGatherOnce();
|
|
allocator_session_->ClearGettingPorts();
|
|
}
|
|
|
|
void OnIceRegathering(cricket::PortAllocatorSession* allocator_session,
|
|
cricket::IceRegatheringReason reason) {
|
|
++count_[reason];
|
|
}
|
|
|
|
int GetRegatheringReasonCount(cricket::IceRegatheringReason reason) {
|
|
return count_[reason];
|
|
}
|
|
|
|
BasicRegatheringController* regathering_controller() {
|
|
return regathering_controller_.get();
|
|
}
|
|
|
|
private:
|
|
std::unique_ptr<rtc::VirtualSocketServer> vss_;
|
|
rtc::AutoSocketServerThread thread_;
|
|
std::unique_ptr<cricket::IceTransportInternal> ice_transport_;
|
|
std::unique_ptr<BasicRegatheringController> regathering_controller_;
|
|
std::unique_ptr<cricket::PortAllocator> allocator_;
|
|
std::unique_ptr<cricket::PortAllocatorSession> allocator_session_;
|
|
std::map<cricket::IceRegatheringReason, int> count_;
|
|
};
|
|
|
|
// Tests that ICE regathering occurs only if the port allocator session is
|
|
// cleared. A port allocation session is not cleared if the initial gathering is
|
|
// still in progress or the continual gathering is not enabled.
|
|
TEST_F(RegatheringControllerTest,
|
|
IceRegatheringDoesNotOccurIfSessionNotCleared) {
|
|
rtc::ScopedFakeClock clock;
|
|
InitializeAndGatherOnce(); // Session not cleared.
|
|
|
|
rtc::IntervalRange regather_all_networks_interval_range(2000, 2000);
|
|
BasicRegatheringController::Config config(
|
|
regather_all_networks_interval_range, 2000);
|
|
regathering_controller()->SetConfig(config);
|
|
regathering_controller()->Start();
|
|
SIMULATED_WAIT(false, 10000, clock);
|
|
// Expect no regathering in the last 10s.
|
|
EXPECT_EQ(0, GetRegatheringReasonCount(
|
|
cricket::IceRegatheringReason::OCCASIONAL_REFRESH));
|
|
EXPECT_EQ(0, GetRegatheringReasonCount(
|
|
cricket::IceRegatheringReason::NETWORK_FAILURE));
|
|
}
|
|
|
|
TEST_F(RegatheringControllerTest, IceRegatheringRepeatsAsScheduled) {
|
|
rtc::ScopedFakeClock clock;
|
|
InitializeAndGatherOnceWithSessionCleared();
|
|
|
|
rtc::IntervalRange regather_all_networks_interval_range(2000, 2000);
|
|
BasicRegatheringController::Config config(
|
|
regather_all_networks_interval_range, 2000);
|
|
regathering_controller()->SetConfig(config);
|
|
regathering_controller()->Start();
|
|
SIMULATED_WAIT(false, 2000 - 1, clock);
|
|
// Expect no regathering.
|
|
EXPECT_EQ(0, GetRegatheringReasonCount(
|
|
cricket::IceRegatheringReason::OCCASIONAL_REFRESH));
|
|
EXPECT_EQ(0, GetRegatheringReasonCount(
|
|
cricket::IceRegatheringReason::NETWORK_FAILURE));
|
|
SIMULATED_WAIT(false, 2, clock);
|
|
// Expect regathering on all networks and on failed networks to happen once
|
|
// respectively in that last 2s with 2s interval.
|
|
EXPECT_EQ(1, GetRegatheringReasonCount(
|
|
cricket::IceRegatheringReason::OCCASIONAL_REFRESH));
|
|
EXPECT_EQ(1, GetRegatheringReasonCount(
|
|
cricket::IceRegatheringReason::NETWORK_FAILURE));
|
|
SIMULATED_WAIT(false, 11000, clock);
|
|
// Expect regathering to happen for another 5 times in 11s with 2s interval.
|
|
EXPECT_EQ(6, GetRegatheringReasonCount(
|
|
cricket::IceRegatheringReason::OCCASIONAL_REFRESH));
|
|
EXPECT_EQ(6, GetRegatheringReasonCount(
|
|
cricket::IceRegatheringReason::NETWORK_FAILURE));
|
|
}
|
|
|
|
// Tests that the schedule of ICE regathering on all networks can be started
|
|
// when not scheduled initially.
|
|
TEST_F(RegatheringControllerTest,
|
|
IceRegatheringOnAllNetworksCanBeScheduledAfterStart) {
|
|
rtc::ScopedFakeClock clock;
|
|
InitializeAndGatherOnceWithSessionCleared();
|
|
|
|
BasicRegatheringController::Config config(absl::nullopt, 2000);
|
|
regathering_controller()->SetConfig(config);
|
|
regathering_controller()->Start();
|
|
SIMULATED_WAIT(false, 3000, clock);
|
|
// Expect no regathering on all networks.
|
|
EXPECT_EQ(0, GetRegatheringReasonCount(
|
|
cricket::IceRegatheringReason::OCCASIONAL_REFRESH));
|
|
config.regather_on_all_networks_interval_range =
|
|
rtc::IntervalRange(2000, 2000);
|
|
regathering_controller()->SetConfig(config);
|
|
SIMULATED_WAIT(false, 11000, clock);
|
|
// Expect regathering to happen for 5 times on all networks in the last 11s
|
|
// with 2s interval.
|
|
EXPECT_EQ(5, GetRegatheringReasonCount(
|
|
cricket::IceRegatheringReason::OCCASIONAL_REFRESH));
|
|
}
|
|
|
|
// Tests that ICE regathering on all networks can be canceled by changing the
|
|
// config.
|
|
TEST_F(RegatheringControllerTest, IceRegatheringOnAllNetworksCanBeCanceled) {
|
|
rtc::ScopedFakeClock clock;
|
|
InitializeAndGatherOnceWithSessionCleared();
|
|
|
|
rtc::IntervalRange regather_all_networks_interval_range(2000, 2000);
|
|
BasicRegatheringController::Config config(
|
|
regather_all_networks_interval_range, 2000);
|
|
regathering_controller()->SetConfig(config);
|
|
regathering_controller()->Start();
|
|
config.regather_on_all_networks_interval_range.reset();
|
|
// Set the regathering interval range on all networks to nullopt should cancel
|
|
// the schedule on all networks.
|
|
regathering_controller()->SetConfig(config);
|
|
SIMULATED_WAIT(false, 10000, clock);
|
|
// Expect no regathering on all networks happened in the last 10s.
|
|
EXPECT_EQ(0, GetRegatheringReasonCount(
|
|
cricket::IceRegatheringReason::OCCASIONAL_REFRESH));
|
|
}
|
|
|
|
// Tests that canceling the regathering on all networks does not cancel the
|
|
// schedule on failed networks.
|
|
TEST_F(RegatheringControllerTest,
|
|
CancelingRegatheringOnAllNetworksDoesNotCancelOnFailedNetworks) {
|
|
rtc::ScopedFakeClock clock;
|
|
InitializeAndGatherOnceWithSessionCleared();
|
|
|
|
rtc::IntervalRange regather_all_networks_interval_range(2000, 2000);
|
|
BasicRegatheringController::Config config(
|
|
regather_all_networks_interval_range, 2000);
|
|
regathering_controller()->SetConfig(config);
|
|
regathering_controller()->Start();
|
|
config.regather_on_all_networks_interval_range =
|
|
rtc::IntervalRange(20000, 20000);
|
|
// Canceling and rescheduling the regathering on all networks should not
|
|
// impact the schedule for failed networks.
|
|
regathering_controller()->SetConfig(config);
|
|
SIMULATED_WAIT(false, 11000, clock);
|
|
// Expect regathering to happen for 5 times for failed networks in the last
|
|
// 11s with 2s interval.
|
|
EXPECT_EQ(5, GetRegatheringReasonCount(
|
|
cricket::IceRegatheringReason::NETWORK_FAILURE));
|
|
}
|
|
|
|
// Tests that canceling the regathering on failed networks does not cancel the
|
|
// schedule on all networks.
|
|
TEST_F(RegatheringControllerTest,
|
|
CancelingRegatheringOnFailedNetworksDoesNotCancelOnAllNetworks) {
|
|
rtc::ScopedFakeClock clock;
|
|
InitializeAndGatherOnceWithSessionCleared();
|
|
|
|
rtc::IntervalRange regather_all_networks_interval_range(2000, 2000);
|
|
BasicRegatheringController::Config config(
|
|
regather_all_networks_interval_range, 2000);
|
|
regathering_controller()->SetConfig(config);
|
|
regathering_controller()->Start();
|
|
config.regather_on_failed_networks_interval = 20000;
|
|
// Canceling and rescheduling the regathering on failed networks should not
|
|
// impact the schedule for all networks.
|
|
regathering_controller()->SetConfig(config);
|
|
SIMULATED_WAIT(false, 11000, clock);
|
|
// Expect regathering to happen for 5 times for all networks in the last 11s
|
|
// with 2s interval.
|
|
EXPECT_EQ(5, GetRegatheringReasonCount(
|
|
cricket::IceRegatheringReason::OCCASIONAL_REFRESH));
|
|
}
|
|
|
|
// Tests that the schedule of ICE regathering on all networks can be canceled
|
|
// and replaced by a new recurring schedule.
|
|
TEST_F(RegatheringControllerTest,
|
|
ScheduleOfIceRegatheringOnAllNetworksCanBeReplaced) {
|
|
rtc::ScopedFakeClock clock;
|
|
InitializeAndGatherOnceWithSessionCleared();
|
|
|
|
rtc::IntervalRange regather_all_networks_interval_range(2000, 2000);
|
|
BasicRegatheringController::Config config(
|
|
regather_all_networks_interval_range, 2000);
|
|
regathering_controller()->SetConfig(config);
|
|
regathering_controller()->Start();
|
|
config.regather_on_all_networks_interval_range =
|
|
rtc::IntervalRange(5000, 5000);
|
|
regathering_controller()->SetConfig(config);
|
|
SIMULATED_WAIT(false, 3000, clock);
|
|
// Expect no regathering from the previous schedule.
|
|
EXPECT_EQ(0, GetRegatheringReasonCount(
|
|
cricket::IceRegatheringReason::OCCASIONAL_REFRESH));
|
|
SIMULATED_WAIT(false, 11000 - 3000, clock);
|
|
// Expect regathering to happen twice in the last 11s with 5s interval.
|
|
EXPECT_EQ(2, GetRegatheringReasonCount(
|
|
cricket::IceRegatheringReason::OCCASIONAL_REFRESH));
|
|
}
|
|
|
|
// Tests that the schedule of ICE regathering on failed networks can be canceled
|
|
// and replaced by a new recurring schedule.
|
|
TEST_F(RegatheringControllerTest,
|
|
ScheduleOfIceRegatheringOnFailedNetworksCanBeReplaced) {
|
|
rtc::ScopedFakeClock clock;
|
|
InitializeAndGatherOnceWithSessionCleared();
|
|
|
|
rtc::IntervalRange regather_all_networks_interval_range(2000, 2000);
|
|
BasicRegatheringController::Config config(
|
|
regather_all_networks_interval_range, 2000);
|
|
regathering_controller()->SetConfig(config);
|
|
regathering_controller()->Start();
|
|
config.regather_on_failed_networks_interval = 5000;
|
|
regathering_controller()->SetConfig(config);
|
|
SIMULATED_WAIT(false, 3000, clock);
|
|
// Expect no regathering from the previous schedule.
|
|
EXPECT_EQ(0, GetRegatheringReasonCount(
|
|
cricket::IceRegatheringReason::NETWORK_FAILURE));
|
|
SIMULATED_WAIT(false, 11000 - 3000, clock);
|
|
// Expect regathering to happen twice in the last 11s with 5s interval.
|
|
EXPECT_EQ(2, GetRegatheringReasonCount(
|
|
cricket::IceRegatheringReason::NETWORK_FAILURE));
|
|
}
|
|
|
|
} // namespace webrtc
|