mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-18 08:07:56 +01:00

This is a reland of cd8d1cf68e
Original change's description:
> Surface ICE candidates that match an updated candidate filter.
>
> After this change an ICE agent can surface candidates that do not match
> the previous filter but are allowed by the updated one. The candidate
> filter, as part of the internal implementation in the ICE transport,
> manifests the RTCIceTransportPolicy field in RTCConfiguration.
>
> This new feature would allow an ICE agent to gather new candidates when
> the transport policy changes from e.g. 'relay' to 'all' without an ICE
> restart.
>
> A caveat in the current implementation remains, and a candidate can
> surface multiple times if the transport policy, or the candidate filter
> directly, performs multiple transitions from a value that disallows to
> one that allows the underlying candidate type. For example, if the
> transport policy is updated by 'all' -> 'relay' -> 'all', the same host
> candidate can surface after the second update.
>
>
> Bug: webrtc:8939
> Change-Id: I92c2e07dafab225c702c5de28f47958a0d3270cc
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132282
> Commit-Queue: Qingsi Wang <qingsi@webrtc.org>
> Reviewed-by: Jeroen de Borst <jeroendb@webrtc.org>
> Reviewed-by: Seth Hampson <shampson@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#27674}
Bug: webrtc:8939
Change-Id: I9c32b1ea05028ecd937ab4912779dd958faf734f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/133582
Reviewed-by: Seth Hampson <shampson@webrtc.org>
Reviewed-by: Jeroen de Borst <jeroendb@webrtc.org>
Commit-Queue: Qingsi Wang <qingsi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27694}
321 lines
11 KiB
C++
321 lines
11 KiB
C++
/*
|
|
* Copyright 2004 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/port_allocator.h"
|
|
|
|
#include <iterator>
|
|
#include <set>
|
|
#include <utility>
|
|
|
|
#include "p2p/base/ice_credentials_iterator.h"
|
|
#include "rtc_base/checks.h"
|
|
#include "rtc_base/logging.h"
|
|
|
|
namespace cricket {
|
|
|
|
RelayServerConfig::RelayServerConfig(RelayType type) : type(type) {}
|
|
|
|
RelayServerConfig::RelayServerConfig(const rtc::SocketAddress& address,
|
|
const std::string& username,
|
|
const std::string& password,
|
|
ProtocolType proto)
|
|
: type(RELAY_TURN), credentials(username, password) {
|
|
ports.push_back(ProtocolAddress(address, proto));
|
|
}
|
|
|
|
RelayServerConfig::RelayServerConfig(const std::string& address,
|
|
int port,
|
|
const std::string& username,
|
|
const std::string& password,
|
|
ProtocolType proto)
|
|
: RelayServerConfig(rtc::SocketAddress(address, port),
|
|
username,
|
|
password,
|
|
proto) {}
|
|
|
|
// Legacy constructor where "secure" and PROTO_TCP implies PROTO_TLS.
|
|
RelayServerConfig::RelayServerConfig(const std::string& address,
|
|
int port,
|
|
const std::string& username,
|
|
const std::string& password,
|
|
ProtocolType proto,
|
|
bool secure)
|
|
: RelayServerConfig(address,
|
|
port,
|
|
username,
|
|
password,
|
|
(proto == PROTO_TCP && secure ? PROTO_TLS : proto)) {}
|
|
|
|
RelayServerConfig::RelayServerConfig(const RelayServerConfig&) = default;
|
|
|
|
RelayServerConfig::~RelayServerConfig() = default;
|
|
|
|
PortAllocatorSession::PortAllocatorSession(const std::string& content_name,
|
|
int component,
|
|
const std::string& ice_ufrag,
|
|
const std::string& ice_pwd,
|
|
uint32_t flags)
|
|
: flags_(flags),
|
|
generation_(0),
|
|
content_name_(content_name),
|
|
component_(component),
|
|
ice_ufrag_(ice_ufrag),
|
|
ice_pwd_(ice_pwd) {
|
|
// Pooled sessions are allowed to be created with empty content name,
|
|
// component, ufrag and password.
|
|
RTC_DCHECK(ice_ufrag.empty() == ice_pwd.empty());
|
|
}
|
|
|
|
PortAllocatorSession::~PortAllocatorSession() = default;
|
|
|
|
bool PortAllocatorSession::IsCleared() const {
|
|
return false;
|
|
}
|
|
|
|
bool PortAllocatorSession::IsStopped() const {
|
|
return false;
|
|
}
|
|
|
|
void PortAllocatorSession::GetCandidateStatsFromReadyPorts(
|
|
CandidateStatsList* candidate_stats_list) const {
|
|
auto ports = ReadyPorts();
|
|
for (auto* port : ports) {
|
|
auto candidates = port->Candidates();
|
|
for (const auto& candidate : candidates) {
|
|
CandidateStats candidate_stats(candidate);
|
|
port->GetStunStats(&candidate_stats.stun_stats);
|
|
bool mdns_obfuscation_enabled =
|
|
port->Network()->GetMdnsResponder() != nullptr;
|
|
if (mdns_obfuscation_enabled) {
|
|
bool use_hostname_address = candidate.type() == LOCAL_PORT_TYPE;
|
|
bool filter_related_address = candidate.type() == STUN_PORT_TYPE;
|
|
candidate_stats.candidate = candidate_stats.candidate.ToSanitizedCopy(
|
|
use_hostname_address, filter_related_address);
|
|
}
|
|
candidate_stats_list->push_back(std::move(candidate_stats));
|
|
}
|
|
}
|
|
}
|
|
|
|
uint32_t PortAllocatorSession::generation() {
|
|
return generation_;
|
|
}
|
|
|
|
void PortAllocatorSession::set_generation(uint32_t generation) {
|
|
generation_ = generation;
|
|
}
|
|
|
|
PortAllocator::PortAllocator()
|
|
: flags_(kDefaultPortAllocatorFlags),
|
|
min_port_(0),
|
|
max_port_(0),
|
|
max_ipv6_networks_(kDefaultMaxIPv6Networks),
|
|
step_delay_(kDefaultStepDelay),
|
|
allow_tcp_listen_(true),
|
|
candidate_filter_(CF_ALL) {
|
|
// The allocator will be attached to a thread in Initialize.
|
|
thread_checker_.Detach();
|
|
}
|
|
|
|
void PortAllocator::Initialize() {
|
|
RTC_DCHECK(thread_checker_.IsCurrent());
|
|
initialized_ = true;
|
|
}
|
|
|
|
PortAllocator::~PortAllocator() {
|
|
CheckRunOnValidThreadIfInitialized();
|
|
}
|
|
|
|
void PortAllocator::set_restrict_ice_credentials_change(bool value) {
|
|
restrict_ice_credentials_change_ = value;
|
|
}
|
|
|
|
bool PortAllocator::SetConfiguration(
|
|
const ServerAddresses& stun_servers,
|
|
const std::vector<RelayServerConfig>& turn_servers,
|
|
int candidate_pool_size,
|
|
bool prune_turn_ports,
|
|
webrtc::TurnCustomizer* turn_customizer,
|
|
const absl::optional<int>& stun_candidate_keepalive_interval) {
|
|
CheckRunOnValidThreadIfInitialized();
|
|
// A positive candidate pool size would lead to the creation of a pooled
|
|
// allocator session and starting getting ports, which we should only do on
|
|
// the network thread.
|
|
RTC_DCHECK(candidate_pool_size == 0 || thread_checker_.IsCurrent());
|
|
bool ice_servers_changed =
|
|
(stun_servers != stun_servers_ || turn_servers != turn_servers_);
|
|
stun_servers_ = stun_servers;
|
|
turn_servers_ = turn_servers;
|
|
prune_turn_ports_ = prune_turn_ports;
|
|
|
|
if (candidate_pool_frozen_) {
|
|
if (candidate_pool_size != candidate_pool_size_) {
|
|
RTC_LOG(LS_ERROR)
|
|
<< "Trying to change candidate pool size after pool was frozen.";
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
if (candidate_pool_size < 0) {
|
|
RTC_LOG(LS_ERROR) << "Can't set negative pool size.";
|
|
return false;
|
|
}
|
|
|
|
candidate_pool_size_ = candidate_pool_size;
|
|
|
|
// If ICE servers changed, throw away any existing pooled sessions and create
|
|
// new ones.
|
|
if (ice_servers_changed) {
|
|
pooled_sessions_.clear();
|
|
}
|
|
|
|
turn_customizer_ = turn_customizer;
|
|
|
|
// If |candidate_pool_size_| is less than the number of pooled sessions, get
|
|
// rid of the extras.
|
|
while (candidate_pool_size_ < static_cast<int>(pooled_sessions_.size())) {
|
|
pooled_sessions_.back().reset(nullptr);
|
|
pooled_sessions_.pop_back();
|
|
}
|
|
|
|
// |stun_candidate_keepalive_interval_| will be used in STUN port allocation
|
|
// in future sessions. We also update the ready ports in the pooled sessions.
|
|
// Ports in sessions that are taken and owned by P2PTransportChannel will be
|
|
// updated there via IceConfig.
|
|
stun_candidate_keepalive_interval_ = stun_candidate_keepalive_interval;
|
|
for (const auto& session : pooled_sessions_) {
|
|
session->SetStunKeepaliveIntervalForReadyPorts(
|
|
stun_candidate_keepalive_interval_);
|
|
}
|
|
|
|
// If |candidate_pool_size_| is greater than the number of pooled sessions,
|
|
// create new sessions.
|
|
while (static_cast<int>(pooled_sessions_.size()) < candidate_pool_size_) {
|
|
IceParameters iceCredentials =
|
|
IceCredentialsIterator::CreateRandomIceCredentials();
|
|
PortAllocatorSession* pooled_session =
|
|
CreateSessionInternal("", 0, iceCredentials.ufrag, iceCredentials.pwd);
|
|
pooled_session->set_pooled(true);
|
|
pooled_session->StartGettingPorts();
|
|
pooled_sessions_.push_back(
|
|
std::unique_ptr<PortAllocatorSession>(pooled_session));
|
|
}
|
|
return true;
|
|
}
|
|
|
|
std::unique_ptr<PortAllocatorSession> PortAllocator::CreateSession(
|
|
const std::string& content_name,
|
|
int component,
|
|
const std::string& ice_ufrag,
|
|
const std::string& ice_pwd) {
|
|
CheckRunOnValidThreadAndInitialized();
|
|
auto session = std::unique_ptr<PortAllocatorSession>(
|
|
CreateSessionInternal(content_name, component, ice_ufrag, ice_pwd));
|
|
session->SetCandidateFilter(candidate_filter());
|
|
return session;
|
|
}
|
|
|
|
std::unique_ptr<PortAllocatorSession> PortAllocator::TakePooledSession(
|
|
const std::string& content_name,
|
|
int component,
|
|
const std::string& ice_ufrag,
|
|
const std::string& ice_pwd) {
|
|
CheckRunOnValidThreadAndInitialized();
|
|
RTC_DCHECK(!ice_ufrag.empty());
|
|
RTC_DCHECK(!ice_pwd.empty());
|
|
if (pooled_sessions_.empty()) {
|
|
return nullptr;
|
|
}
|
|
|
|
IceParameters credentials(ice_ufrag, ice_pwd, false);
|
|
// If restrict_ice_credentials_change_ is TRUE, then call FindPooledSession
|
|
// with ice credentials. Otherwise call it with nullptr which means
|
|
// "find any" pooled session.
|
|
auto cit = FindPooledSession(restrict_ice_credentials_change_ ? &credentials
|
|
: nullptr);
|
|
if (cit == pooled_sessions_.end()) {
|
|
return nullptr;
|
|
}
|
|
|
|
auto it =
|
|
pooled_sessions_.begin() + std::distance(pooled_sessions_.cbegin(), cit);
|
|
std::unique_ptr<PortAllocatorSession> ret = std::move(*it);
|
|
ret->SetIceParameters(content_name, component, ice_ufrag, ice_pwd);
|
|
ret->set_pooled(false);
|
|
// According to JSEP, a pooled session should filter candidates only
|
|
// after it's taken out of the pool.
|
|
ret->SetCandidateFilter(candidate_filter());
|
|
pooled_sessions_.erase(it);
|
|
return ret;
|
|
}
|
|
|
|
const PortAllocatorSession* PortAllocator::GetPooledSession(
|
|
const IceParameters* ice_credentials) const {
|
|
CheckRunOnValidThreadAndInitialized();
|
|
auto it = FindPooledSession(ice_credentials);
|
|
if (it == pooled_sessions_.end()) {
|
|
return nullptr;
|
|
} else {
|
|
return it->get();
|
|
}
|
|
}
|
|
|
|
std::vector<std::unique_ptr<PortAllocatorSession>>::const_iterator
|
|
PortAllocator::FindPooledSession(const IceParameters* ice_credentials) const {
|
|
for (auto it = pooled_sessions_.begin(); it != pooled_sessions_.end(); ++it) {
|
|
if (ice_credentials == nullptr ||
|
|
((*it)->ice_ufrag() == ice_credentials->ufrag &&
|
|
(*it)->ice_pwd() == ice_credentials->pwd)) {
|
|
return it;
|
|
}
|
|
}
|
|
return pooled_sessions_.end();
|
|
}
|
|
|
|
void PortAllocator::FreezeCandidatePool() {
|
|
CheckRunOnValidThreadAndInitialized();
|
|
candidate_pool_frozen_ = true;
|
|
}
|
|
|
|
void PortAllocator::DiscardCandidatePool() {
|
|
CheckRunOnValidThreadIfInitialized();
|
|
pooled_sessions_.clear();
|
|
}
|
|
|
|
void PortAllocator::SetCandidateFilter(uint32_t filter) {
|
|
CheckRunOnValidThreadIfInitialized();
|
|
if (candidate_filter_ == filter) {
|
|
return;
|
|
}
|
|
uint32_t prev_filter = candidate_filter_;
|
|
candidate_filter_ = filter;
|
|
SignalCandidateFilterChanged(prev_filter, filter);
|
|
}
|
|
|
|
void PortAllocator::GetCandidateStatsFromPooledSessions(
|
|
CandidateStatsList* candidate_stats_list) {
|
|
CheckRunOnValidThreadAndInitialized();
|
|
for (const auto& session : pooled_sessions()) {
|
|
session->GetCandidateStatsFromReadyPorts(candidate_stats_list);
|
|
}
|
|
}
|
|
|
|
std::vector<IceParameters> PortAllocator::GetPooledIceCredentials() {
|
|
CheckRunOnValidThreadAndInitialized();
|
|
std::vector<IceParameters> list;
|
|
for (const auto& session : pooled_sessions_) {
|
|
list.push_back(
|
|
IceParameters(session->ice_ufrag(), session->ice_pwd(), false));
|
|
}
|
|
return list;
|
|
}
|
|
|
|
} // namespace cricket
|