webrtc_m130/p2p/base/regatheringcontroller.cc
Alex Loiko 9289edae6f Revert "Replace the IceConnectionState implementation."
This reverts commit 1e87b4f32b73526f9caaae2a7bccfbd0cd84dcb9.

Reason for revert: Breaks internal project

Original change's description:
> Replace the IceConnectionState implementation.
> 
> PeerConnection::ice_connection_state() used to return a value based on both DTLS and ICE transports.
> Now that we have PeerConnection::peer_connection_state() to fill that role we can change the implementation of ice_connection_state over to match the spec.
> 
> Bug: webrtc:6145
> Change-Id: Ia4f348f728f24faf4b976c63dea2187bb1f01ef0
> Reviewed-on: https://webrtc-review.googlesource.com/c/108780
> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
> Reviewed-by: Harald Alvestrand <hta@webrtc.org>
> Commit-Queue: Jonas Olsson <jonasolsson@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#25773}

TBR=kwiberg@webrtc.org,hbos@webrtc.org,hta@webrtc.org,jonasolsson@webrtc.org

Change-Id: Icc4368d120a4167286fa6ba2e884a3650b453eff
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:6145
Reviewed-on: https://webrtc-review.googlesource.com/c/111925
Reviewed-by: Alex Loiko <aleloi@webrtc.org>
Commit-Queue: Alex Loiko <aleloi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25775}
2018-11-23 16:19:05 +00:00

158 lines
5.9 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/regatheringcontroller.h"
namespace webrtc {
using Config = BasicRegatheringController::Config;
Config::Config(const absl::optional<rtc::IntervalRange>&
regather_on_all_networks_interval_range,
int regather_on_failed_networks_interval)
: regather_on_all_networks_interval_range(
regather_on_all_networks_interval_range),
regather_on_failed_networks_interval(
regather_on_failed_networks_interval) {}
Config::Config(const Config& other) = default;
Config::~Config() = default;
Config& Config::operator=(const Config& other) = default;
BasicRegatheringController::BasicRegatheringController(
const Config& config,
cricket::IceTransportInternal* ice_transport,
rtc::Thread* thread)
: config_(config),
ice_transport_(ice_transport),
thread_(thread),
rand_(rtc::SystemTimeNanos()) {
RTC_DCHECK(ice_transport_);
RTC_DCHECK(thread_);
ice_transport_->SignalStateChanged.connect(
this, &BasicRegatheringController::OnIceTransportStateChanged);
ice_transport->SignalWritableState.connect(
this, &BasicRegatheringController::OnIceTransportWritableState);
ice_transport->SignalReceivingState.connect(
this, &BasicRegatheringController::OnIceTransportReceivingState);
ice_transport->SignalNetworkRouteChanged.connect(
this, &BasicRegatheringController::OnIceTransportNetworkRouteChanged);
}
BasicRegatheringController::~BasicRegatheringController() = default;
void BasicRegatheringController::Start() {
ScheduleRecurringRegatheringOnFailedNetworks();
if (config_.regather_on_all_networks_interval_range) {
ScheduleRecurringRegatheringOnAllNetworks();
}
}
void BasicRegatheringController::SetConfig(const Config& config) {
bool need_cancel_on_all_networks =
has_recurring_schedule_on_all_networks_ &&
(config_.regather_on_all_networks_interval_range !=
config.regather_on_all_networks_interval_range);
bool need_reschedule_on_all_networks =
config.regather_on_all_networks_interval_range &&
(config_.regather_on_all_networks_interval_range !=
config.regather_on_all_networks_interval_range);
bool need_cancel_and_reschedule_on_failed_networks =
has_recurring_schedule_on_failed_networks_ &&
(config_.regather_on_failed_networks_interval !=
config.regather_on_failed_networks_interval);
config_ = config;
if (need_cancel_on_all_networks) {
CancelScheduledRecurringRegatheringOnAllNetworks();
}
if (need_reschedule_on_all_networks) {
ScheduleRecurringRegatheringOnAllNetworks();
}
if (need_cancel_and_reschedule_on_failed_networks) {
CancelScheduledRecurringRegatheringOnFailedNetworks();
ScheduleRecurringRegatheringOnFailedNetworks();
}
}
void BasicRegatheringController::ScheduleRecurringRegatheringOnAllNetworks() {
RTC_DCHECK(config_.regather_on_all_networks_interval_range &&
config_.regather_on_all_networks_interval_range.value().min() >=
0);
int delay_ms = SampleRegatherAllNetworksInterval(
config_.regather_on_all_networks_interval_range.value());
CancelScheduledRecurringRegatheringOnAllNetworks();
has_recurring_schedule_on_all_networks_ = true;
invoker_for_all_networks_.AsyncInvokeDelayed<void>(
RTC_FROM_HERE, thread(),
rtc::Bind(
&BasicRegatheringController::RegatherOnAllNetworksIfDoneGathering,
this, true),
delay_ms);
}
void BasicRegatheringController::RegatherOnAllNetworksIfDoneGathering(
bool repeated) {
// Only regather when the current session is in the CLEARED state (i.e., not
// running or stopped). It is only possible to enter this state when we gather
// continually, so there is an implicit check on continual gathering here.
if (allocator_session_ && allocator_session_->IsCleared()) {
allocator_session_->RegatherOnAllNetworks();
}
if (repeated) {
ScheduleRecurringRegatheringOnAllNetworks();
}
}
void BasicRegatheringController::
ScheduleRecurringRegatheringOnFailedNetworks() {
RTC_DCHECK(config_.regather_on_failed_networks_interval >= 0);
CancelScheduledRecurringRegatheringOnFailedNetworks();
has_recurring_schedule_on_failed_networks_ = true;
invoker_for_failed_networks_.AsyncInvokeDelayed<void>(
RTC_FROM_HERE, thread(),
rtc::Bind(
&BasicRegatheringController::RegatherOnFailedNetworksIfDoneGathering,
this, true),
config_.regather_on_failed_networks_interval);
}
void BasicRegatheringController::RegatherOnFailedNetworksIfDoneGathering(
bool repeated) {
// Only regather when the current session is in the CLEARED state (i.e., not
// running or stopped). It is only possible to enter this state when we gather
// continually, so there is an implicit check on continual gathering here.
if (allocator_session_ && allocator_session_->IsCleared()) {
allocator_session_->RegatherOnFailedNetworks();
}
if (repeated) {
ScheduleRecurringRegatheringOnFailedNetworks();
}
}
void BasicRegatheringController::
CancelScheduledRecurringRegatheringOnAllNetworks() {
invoker_for_all_networks_.Clear();
has_recurring_schedule_on_all_networks_ = false;
}
void BasicRegatheringController::
CancelScheduledRecurringRegatheringOnFailedNetworks() {
invoker_for_failed_networks_.Clear();
has_recurring_schedule_on_failed_networks_ = false;
}
int BasicRegatheringController::SampleRegatherAllNetworksInterval(
const rtc::IntervalRange& range) {
return rand_.Rand(range.min(), range.max());
}
} // namespace webrtc