2014-10-28 22:20:11 +00:00
|
|
|
/*
|
|
|
|
|
* 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.
|
|
|
|
|
*/
|
|
|
|
|
|
2019-01-11 09:11:00 -08:00
|
|
|
#ifndef P2P_CLIENT_BASIC_PORT_ALLOCATOR_H_
|
|
|
|
|
#define P2P_CLIENT_BASIC_PORT_ALLOCATOR_H_
|
2014-10-28 22:20:11 +00:00
|
|
|
|
2016-04-27 07:22:53 -07:00
|
|
|
#include <memory>
|
2014-10-28 22:20:11 +00:00
|
|
|
#include <string>
|
|
|
|
|
#include <vector>
|
|
|
|
|
|
2019-01-11 09:11:00 -08:00
|
|
|
#include "api/turn_customizer.h"
|
|
|
|
|
#include "p2p/base/port_allocator.h"
|
|
|
|
|
#include "p2p/client/relay_port_factory_interface.h"
|
|
|
|
|
#include "p2p/client/turn_port_factory.h"
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "rtc_base/checks.h"
|
2019-01-11 09:11:00 -08:00
|
|
|
#include "rtc_base/message_queue.h"
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "rtc_base/network.h"
|
2018-10-15 17:15:12 +02:00
|
|
|
#include "rtc_base/system/rtc_export.h"
|
2017-09-15 06:47:31 +02:00
|
|
|
#include "rtc_base/thread.h"
|
2014-10-28 22:20:11 +00:00
|
|
|
|
|
|
|
|
namespace cricket {
|
|
|
|
|
|
2018-10-15 17:15:12 +02:00
|
|
|
class RTC_EXPORT BasicPortAllocator : public PortAllocator {
|
2014-10-28 22:20:11 +00:00
|
|
|
public:
|
2017-12-18 12:10:43 +01:00
|
|
|
// note: The (optional) relay_port_factory is owned by caller
|
|
|
|
|
// and must have a life time that exceeds that of BasicPortAllocator.
|
2014-10-28 22:20:11 +00:00
|
|
|
BasicPortAllocator(rtc::NetworkManager* network_manager,
|
2017-10-10 14:01:40 +02:00
|
|
|
rtc::PacketSocketFactory* socket_factory,
|
2017-12-18 12:10:43 +01:00
|
|
|
webrtc::TurnCustomizer* customizer = nullptr,
|
|
|
|
|
RelayPortFactoryInterface* relay_port_factory = nullptr);
|
2014-10-28 22:20:11 +00:00
|
|
|
explicit BasicPortAllocator(rtc::NetworkManager* network_manager);
|
2019-09-06 10:29:50 +02:00
|
|
|
BasicPortAllocator(rtc::NetworkManager* network_manager,
|
|
|
|
|
const ServerAddresses& stun_servers);
|
2014-10-28 22:20:11 +00:00
|
|
|
BasicPortAllocator(rtc::NetworkManager* network_manager,
|
|
|
|
|
rtc::PacketSocketFactory* socket_factory,
|
|
|
|
|
const ServerAddresses& stun_servers);
|
2017-10-30 16:23:38 -07:00
|
|
|
~BasicPortAllocator() override;
|
2014-10-28 22:20:11 +00:00
|
|
|
|
2015-12-29 14:14:52 -08:00
|
|
|
// Set to kDefaultNetworkIgnoreMask by default.
|
2017-10-30 16:23:38 -07:00
|
|
|
void SetNetworkIgnoreMask(int network_ignore_mask) override;
|
2018-04-11 16:57:45 -07:00
|
|
|
int network_ignore_mask() const {
|
|
|
|
|
CheckRunOnValidThreadIfInitialized();
|
|
|
|
|
return network_ignore_mask_;
|
|
|
|
|
}
|
2015-12-29 14:14:52 -08:00
|
|
|
|
2018-04-11 16:57:45 -07:00
|
|
|
rtc::NetworkManager* network_manager() const {
|
|
|
|
|
CheckRunOnValidThreadIfInitialized();
|
|
|
|
|
return network_manager_;
|
|
|
|
|
}
|
2014-10-28 22:20:11 +00:00
|
|
|
|
|
|
|
|
// If socket_factory() is set to NULL each PortAllocatorSession
|
|
|
|
|
// creates its own socket factory.
|
2018-04-11 16:57:45 -07:00
|
|
|
rtc::PacketSocketFactory* socket_factory() {
|
|
|
|
|
CheckRunOnValidThreadIfInitialized();
|
|
|
|
|
return socket_factory_;
|
|
|
|
|
}
|
2014-10-28 22:20:11 +00:00
|
|
|
|
2015-11-11 12:55:10 -08:00
|
|
|
PortAllocatorSession* CreateSessionInternal(
|
2014-10-28 22:20:11 +00:00
|
|
|
const std::string& content_name,
|
|
|
|
|
int component,
|
|
|
|
|
const std::string& ice_ufrag,
|
2015-11-11 12:55:10 -08:00
|
|
|
const std::string& ice_pwd) override;
|
2014-10-28 22:20:11 +00:00
|
|
|
|
2016-05-13 08:15:11 -07:00
|
|
|
// Convenience method that adds a TURN server to the configuration.
|
|
|
|
|
void AddTurnServer(const RelayServerConfig& turn_server);
|
|
|
|
|
|
2017-12-18 12:10:43 +01:00
|
|
|
RelayPortFactoryInterface* relay_port_factory() {
|
2018-04-11 16:57:45 -07:00
|
|
|
CheckRunOnValidThreadIfInitialized();
|
2017-12-18 12:10:43 +01:00
|
|
|
return relay_port_factory_;
|
|
|
|
|
}
|
|
|
|
|
|
2014-10-28 22:20:11 +00:00
|
|
|
private:
|
|
|
|
|
void Construct();
|
|
|
|
|
|
2016-10-05 11:47:22 -07:00
|
|
|
void OnIceRegathering(PortAllocatorSession* session,
|
|
|
|
|
IceRegatheringReason reason);
|
|
|
|
|
|
2017-12-18 12:10:43 +01:00
|
|
|
// This function makes sure that relay_port_factory_ is set properly.
|
|
|
|
|
void InitRelayPortFactory(RelayPortFactoryInterface* relay_port_factory);
|
|
|
|
|
|
2019-08-19 16:07:40 -07:00
|
|
|
bool MdnsObfuscationEnabled() const override;
|
|
|
|
|
|
2014-10-28 22:20:11 +00:00
|
|
|
rtc::NetworkManager* network_manager_;
|
|
|
|
|
rtc::PacketSocketFactory* socket_factory_;
|
|
|
|
|
bool allow_tcp_listen_;
|
2015-12-29 14:14:52 -08:00
|
|
|
int network_ignore_mask_ = rtc::kDefaultNetworkIgnoreMask;
|
2017-12-18 12:10:43 +01:00
|
|
|
|
|
|
|
|
// This is the factory being used.
|
|
|
|
|
RelayPortFactoryInterface* relay_port_factory_;
|
|
|
|
|
|
|
|
|
|
// This instance is created if caller does pass a factory.
|
|
|
|
|
std::unique_ptr<RelayPortFactoryInterface> default_relay_port_factory_;
|
2014-10-28 22:20:11 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct PortConfiguration;
|
|
|
|
|
class AllocationSequence;
|
|
|
|
|
|
2016-07-01 17:31:12 -07:00
|
|
|
enum class SessionState {
|
|
|
|
|
GATHERING, // Actively allocating ports and gathering candidates.
|
|
|
|
|
CLEARED, // Current allocation process has been stopped but may start
|
|
|
|
|
// new ones.
|
|
|
|
|
STOPPED // This session has completely stopped, no new allocation
|
|
|
|
|
// process will be started.
|
|
|
|
|
};
|
|
|
|
|
|
2018-10-15 17:15:12 +02:00
|
|
|
class RTC_EXPORT BasicPortAllocatorSession : public PortAllocatorSession,
|
|
|
|
|
public rtc::MessageHandler {
|
2014-10-28 22:20:11 +00:00
|
|
|
public:
|
|
|
|
|
BasicPortAllocatorSession(BasicPortAllocator* allocator,
|
|
|
|
|
const std::string& content_name,
|
|
|
|
|
int component,
|
|
|
|
|
const std::string& ice_ufrag,
|
|
|
|
|
const std::string& ice_pwd);
|
2017-10-30 16:23:38 -07:00
|
|
|
~BasicPortAllocatorSession() override;
|
2014-10-28 22:20:11 +00:00
|
|
|
|
2017-10-30 16:23:38 -07:00
|
|
|
virtual BasicPortAllocator* allocator();
|
2014-10-28 22:20:11 +00:00
|
|
|
rtc::Thread* network_thread() { return network_thread_; }
|
|
|
|
|
rtc::PacketSocketFactory* socket_factory() { return socket_factory_; }
|
|
|
|
|
|
2019-04-18 10:41:58 -07:00
|
|
|
// If the new filter allows new types of candidates compared to the previous
|
|
|
|
|
// filter, gathered candidates that were discarded because of not matching the
|
|
|
|
|
// previous filter will be signaled if they match the new one.
|
|
|
|
|
//
|
|
|
|
|
// We do not perform any regathering since the port allocator flags decide
|
|
|
|
|
// the type of candidates to gather and the candidate filter only controls the
|
|
|
|
|
// signaling of candidates. As a result, with the candidate filter changed
|
|
|
|
|
// alone, all newly allowed candidates for signaling should already be
|
|
|
|
|
// gathered by the respective cricket::Port.
|
2016-05-23 16:02:19 -07:00
|
|
|
void SetCandidateFilter(uint32_t filter) override;
|
2015-11-11 12:55:10 -08:00
|
|
|
void StartGettingPorts() override;
|
|
|
|
|
void StopGettingPorts() override;
|
|
|
|
|
void ClearGettingPorts() override;
|
2017-10-30 16:23:38 -07:00
|
|
|
bool IsGettingPorts() override;
|
|
|
|
|
bool IsCleared() const override;
|
|
|
|
|
bool IsStopped() const override;
|
2016-05-13 08:15:11 -07:00
|
|
|
// These will all be cricket::Ports.
|
|
|
|
|
std::vector<PortInterface*> ReadyPorts() const override;
|
|
|
|
|
std::vector<Candidate> ReadyCandidates() const override;
|
|
|
|
|
bool CandidatesAllocationDone() const override;
|
2016-07-01 13:59:29 -07:00
|
|
|
void RegatherOnFailedNetworks() override;
|
2017-07-14 10:13:10 -07:00
|
|
|
void RegatherOnAllNetworks() override;
|
2019-08-19 16:07:40 -07:00
|
|
|
void GetCandidateStatsFromReadyPorts(
|
|
|
|
|
CandidateStatsList* candidate_stats_list) const override;
|
2018-02-20 14:45:49 -08:00
|
|
|
void SetStunKeepaliveIntervalForReadyPorts(
|
2018-06-15 15:58:38 +02:00
|
|
|
const absl::optional<int>& stun_keepalive_interval) override;
|
2016-07-28 18:06:15 -07:00
|
|
|
void PruneAllPorts() override;
|
2014-10-28 22:20:11 +00:00
|
|
|
|
|
|
|
|
protected:
|
2016-05-13 08:15:11 -07:00
|
|
|
void UpdateIceParametersInternal() override;
|
|
|
|
|
|
2014-10-28 22:20:11 +00:00
|
|
|
// Starts the process of getting the port configurations.
|
|
|
|
|
virtual void GetPortConfigurations();
|
|
|
|
|
|
|
|
|
|
// Adds a port configuration that is now ready. Once we have one for each
|
|
|
|
|
// network (or a timeout occurs), we will start allocating ports.
|
|
|
|
|
virtual void ConfigReady(PortConfiguration* config);
|
|
|
|
|
|
|
|
|
|
// MessageHandler. Can be overriden if message IDs do not conflict.
|
2015-11-11 12:55:10 -08:00
|
|
|
void OnMessage(rtc::Message* message) override;
|
2014-10-28 22:20:11 +00:00
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
class PortData {
|
|
|
|
|
public:
|
2019-04-18 10:41:58 -07:00
|
|
|
enum State {
|
|
|
|
|
STATE_INPROGRESS, // Still gathering candidates.
|
|
|
|
|
STATE_COMPLETE, // All candidates allocated and ready for process.
|
|
|
|
|
STATE_ERROR, // Error in gathering candidates.
|
|
|
|
|
STATE_PRUNED // Pruned by higher priority ports on the same network
|
|
|
|
|
// interface. Only TURN ports may be pruned.
|
|
|
|
|
};
|
|
|
|
|
|
2016-05-23 16:02:19 -07:00
|
|
|
PortData() {}
|
2014-10-28 22:20:11 +00:00
|
|
|
PortData(Port* port, AllocationSequence* seq)
|
2016-05-23 16:02:19 -07:00
|
|
|
: port_(port), sequence_(seq) {}
|
2014-10-28 22:20:11 +00:00
|
|
|
|
2016-05-13 08:15:11 -07:00
|
|
|
Port* port() const { return port_; }
|
|
|
|
|
AllocationSequence* sequence() const { return sequence_; }
|
2016-05-23 16:02:19 -07:00
|
|
|
bool has_pairable_candidate() const { return has_pairable_candidate_; }
|
2019-04-18 10:41:58 -07:00
|
|
|
State state() const { return state_; }
|
2016-05-13 08:15:11 -07:00
|
|
|
bool complete() const { return state_ == STATE_COMPLETE; }
|
|
|
|
|
bool error() const { return state_ == STATE_ERROR; }
|
2016-06-30 20:52:02 -07:00
|
|
|
bool pruned() const { return state_ == STATE_PRUNED; }
|
|
|
|
|
bool inprogress() const { return state_ == STATE_INPROGRESS; }
|
|
|
|
|
// Returns true if this port is ready to be used.
|
|
|
|
|
bool ready() const {
|
|
|
|
|
return has_pairable_candidate_ && state_ != STATE_ERROR &&
|
|
|
|
|
state_ != STATE_PRUNED;
|
|
|
|
|
}
|
2016-09-19 16:57:37 -07:00
|
|
|
// Sets the state to "PRUNED" and prunes the Port.
|
|
|
|
|
void Prune() {
|
|
|
|
|
state_ = STATE_PRUNED;
|
|
|
|
|
if (port()) {
|
|
|
|
|
port()->Prune();
|
|
|
|
|
}
|
|
|
|
|
}
|
2016-05-23 16:02:19 -07:00
|
|
|
void set_has_pairable_candidate(bool has_pairable_candidate) {
|
|
|
|
|
if (has_pairable_candidate) {
|
2017-01-12 05:15:36 -08:00
|
|
|
RTC_DCHECK(state_ == STATE_INPROGRESS);
|
2016-05-23 16:02:19 -07:00
|
|
|
}
|
|
|
|
|
has_pairable_candidate_ = has_pairable_candidate;
|
|
|
|
|
}
|
2019-04-18 10:41:58 -07:00
|
|
|
void set_state(State state) {
|
|
|
|
|
RTC_DCHECK(state != STATE_ERROR || state_ == STATE_INPROGRESS);
|
|
|
|
|
state_ = state;
|
2014-10-28 22:20:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private:
|
2016-05-23 16:02:19 -07:00
|
|
|
Port* port_ = nullptr;
|
|
|
|
|
AllocationSequence* sequence_ = nullptr;
|
|
|
|
|
bool has_pairable_candidate_ = false;
|
2016-07-01 13:59:29 -07:00
|
|
|
State state_ = STATE_INPROGRESS;
|
2014-10-28 22:20:11 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
void OnConfigReady(PortConfiguration* config);
|
|
|
|
|
void OnConfigStop();
|
|
|
|
|
void AllocatePorts();
|
|
|
|
|
void OnAllocate();
|
2017-07-14 10:13:10 -07:00
|
|
|
void DoAllocate(bool disable_equivalent_phases);
|
2014-10-28 22:20:11 +00:00
|
|
|
void OnNetworksChanged();
|
|
|
|
|
void OnAllocationSequenceObjectsCreated();
|
|
|
|
|
void DisableEquivalentPhases(rtc::Network* network,
|
Use suffixed {uint,int}{8,16,32,64}_t types.
Removes the use of uint8, etc. in favor of uint8_t.
BUG=webrtc:5024
R=henrik.lundin@webrtc.org, henrikg@webrtc.org, perkj@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, tina.legrand@webrtc.org
Review URL: https://codereview.webrtc.org/1362503003 .
Cr-Commit-Position: refs/heads/master@{#10196}
2015-10-07 12:23:21 +02:00
|
|
|
PortConfiguration* config,
|
|
|
|
|
uint32_t* flags);
|
2014-10-28 22:20:11 +00:00
|
|
|
void AddAllocatedPort(Port* port,
|
|
|
|
|
AllocationSequence* seq,
|
|
|
|
|
bool prepare_address);
|
|
|
|
|
void OnCandidateReady(Port* port, const Candidate& c);
|
2019-06-01 12:23:43 +03:00
|
|
|
void OnCandidateError(Port* port, const IceCandidateErrorEvent& event);
|
2014-10-28 22:20:11 +00:00
|
|
|
void OnPortComplete(Port* port);
|
|
|
|
|
void OnPortError(Port* port);
|
|
|
|
|
void OnProtocolEnabled(AllocationSequence* seq, ProtocolType proto);
|
|
|
|
|
void OnPortDestroyed(PortInterface* port);
|
Revert "Reland "Enable any address ports by default.""
This reverts commit b89ac622f3f5a7bb065a08cb1efba10a0e8cae23.
Reason for revert: Speculative revert.
Original change's description:
> Reland "Enable any address ports by default."
>
> This reverts commit 1165949341b6f61c5d728999bfbdaf68fd5c15aa.
>
> Reason for revert: Speculative reland (the revert breaks a downstream project).
>
> Original change's description:
> > Revert "Reland "Enable any address ports by default.""
> >
> > This reverts commit ac5bbd940ed31f8a58095952f4dcdcbb1b58203c.
> >
> > Reason for revert: Speculative revert, possibly breaking downstream projects
> >
> > Original change's description:
> > > Reland "Enable any address ports by default."
> > >
> > > This reverts commit 056a68da896d9a578b9ea83e56d261648ea0adc6.
> > >
> > > Reason for revert: Trying to reland.
> > >
> > > Original change's description:
> > > > Revert "Enable any address ports by default."
> > > >
> > > > This reverts commit f04148c810aad2a0809dc8978650c55308381c47.
> > > >
> > > > Reason for revert: Speculative revert. I suspect this is breaking a
> > > > downstream test (I'll reland if it is not the culprit).
> > > >
> > > > Original change's description:
> > > > > Enable any address ports by default.
> > > > >
> > > > > Ports not bound to any specific network interface are allocated by
> > > > > default. These any address ports are pruned after allocation,
> > > > > conditional on the allocation results of normal ports that are bound to
> > > > > the enumerated interfaces.
> > > > >
> > > > > Bug: webrtc:9313
> > > > > Change-Id: I3ce12eeab0cf3547224e5f8c188d061fc530e145
> > > > > Reviewed-on: https://webrtc-review.googlesource.com/78383
> > > > > Commit-Queue: Qingsi Wang <qingsi@google.com>
> > > > > Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
> > > > > Cr-Commit-Position: refs/heads/master@{#23673}
> > > >
> > > > TBR=deadbeef@webrtc.org,pthatcher@webrtc.org,qingsi@google.com
> > > >
> > > > Change-Id: I3b3dc42c7de46d198d4b9c270020dcf1100dd907
> > > > No-Presubmit: true
> > > > No-Tree-Checks: true
> > > > No-Try: true
> > > > Bug: webrtc:9313
> > > > Reviewed-on: https://webrtc-review.googlesource.com/84300
> > > > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> > > > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> > > > Cr-Commit-Position: refs/heads/master@{#23678}
> > >
> > > TBR=deadbeef@webrtc.org,mbonadei@webrtc.org,pthatcher@webrtc.org,qingsi@google.com
> > >
> > > # Not skipping CQ checks because original CL landed > 1 day ago.
> > >
> > > Bug: webrtc:9313
> > > Change-Id: I98442346babb5d8953d37dc5825efaf79804ed7f
> > > Reviewed-on: https://webrtc-review.googlesource.com/85000
> > > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> > > Commit-Queue: Qingsi Wang <qingsi@webrtc.org>
> > > Cr-Commit-Position: refs/heads/master@{#23720}
> >
> > TBR=deadbeef@webrtc.org,mbonadei@webrtc.org,pthatcher@webrtc.org,qingsi@google.com,qingsi@webrtc.org
> >
> > # Not skipping CQ checks because original CL landed > 1 day ago.
> >
> > Bug: webrtc:9313
> > Change-Id: Ie5da4133a371532f717af144f183e299e759f152
> > Reviewed-on: https://webrtc-review.googlesource.com/95340
> > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> > Reviewed-by: Qingsi Wang <qingsi@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#24374}
>
> TBR=deadbeef@webrtc.org,mbonadei@webrtc.org,pthatcher@webrtc.org,qingsi@google.com,qingsi@webrtc.org
>
> Change-Id: I52bf487d441ce8ccedee7e348b9ed9ade0fd9d1c
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:9313
> Reviewed-on: https://webrtc-review.googlesource.com/95440
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#24379}
TBR=deadbeef@webrtc.org,mbonadei@webrtc.org,pthatcher@webrtc.org,qingsi@google.com,qingsi@webrtc.org
Change-Id: I6db41f092c55be74f6594eb729ad5f15c718fe34
Bug: webrtc:9313
Reviewed-on: https://webrtc-review.googlesource.com/95520
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24412}
2018-08-22 17:41:22 +00:00
|
|
|
void MaybeSignalCandidatesAllocationDone();
|
2014-10-28 22:20:11 +00:00
|
|
|
void OnPortAllocationComplete(AllocationSequence* seq);
|
|
|
|
|
PortData* FindPort(Port* port);
|
2016-07-01 13:59:29 -07:00
|
|
|
std::vector<rtc::Network*> GetNetworks();
|
|
|
|
|
std::vector<rtc::Network*> GetFailedNetworks();
|
2017-07-14 10:13:10 -07:00
|
|
|
void Regather(const std::vector<rtc::Network*>& networks,
|
|
|
|
|
bool disable_equivalent_phases,
|
|
|
|
|
IceRegatheringReason reason);
|
2014-10-28 22:20:11 +00:00
|
|
|
|
2016-05-13 08:15:11 -07:00
|
|
|
bool CheckCandidateFilter(const Candidate& c) const;
|
2016-05-23 16:02:19 -07:00
|
|
|
bool CandidatePairable(const Candidate& c, const Port* port) const;
|
2018-11-27 13:20:39 -08:00
|
|
|
|
2016-09-19 16:57:37 -07:00
|
|
|
std::vector<PortData*> GetUnprunedPorts(
|
|
|
|
|
const std::vector<rtc::Network*>& networks);
|
|
|
|
|
// Prunes ports and signal the remote side to remove the candidates that
|
|
|
|
|
// were previously signaled from these ports.
|
Revert "Reland "Enable any address ports by default.""
This reverts commit b89ac622f3f5a7bb065a08cb1efba10a0e8cae23.
Reason for revert: Speculative revert.
Original change's description:
> Reland "Enable any address ports by default."
>
> This reverts commit 1165949341b6f61c5d728999bfbdaf68fd5c15aa.
>
> Reason for revert: Speculative reland (the revert breaks a downstream project).
>
> Original change's description:
> > Revert "Reland "Enable any address ports by default.""
> >
> > This reverts commit ac5bbd940ed31f8a58095952f4dcdcbb1b58203c.
> >
> > Reason for revert: Speculative revert, possibly breaking downstream projects
> >
> > Original change's description:
> > > Reland "Enable any address ports by default."
> > >
> > > This reverts commit 056a68da896d9a578b9ea83e56d261648ea0adc6.
> > >
> > > Reason for revert: Trying to reland.
> > >
> > > Original change's description:
> > > > Revert "Enable any address ports by default."
> > > >
> > > > This reverts commit f04148c810aad2a0809dc8978650c55308381c47.
> > > >
> > > > Reason for revert: Speculative revert. I suspect this is breaking a
> > > > downstream test (I'll reland if it is not the culprit).
> > > >
> > > > Original change's description:
> > > > > Enable any address ports by default.
> > > > >
> > > > > Ports not bound to any specific network interface are allocated by
> > > > > default. These any address ports are pruned after allocation,
> > > > > conditional on the allocation results of normal ports that are bound to
> > > > > the enumerated interfaces.
> > > > >
> > > > > Bug: webrtc:9313
> > > > > Change-Id: I3ce12eeab0cf3547224e5f8c188d061fc530e145
> > > > > Reviewed-on: https://webrtc-review.googlesource.com/78383
> > > > > Commit-Queue: Qingsi Wang <qingsi@google.com>
> > > > > Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
> > > > > Cr-Commit-Position: refs/heads/master@{#23673}
> > > >
> > > > TBR=deadbeef@webrtc.org,pthatcher@webrtc.org,qingsi@google.com
> > > >
> > > > Change-Id: I3b3dc42c7de46d198d4b9c270020dcf1100dd907
> > > > No-Presubmit: true
> > > > No-Tree-Checks: true
> > > > No-Try: true
> > > > Bug: webrtc:9313
> > > > Reviewed-on: https://webrtc-review.googlesource.com/84300
> > > > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> > > > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> > > > Cr-Commit-Position: refs/heads/master@{#23678}
> > >
> > > TBR=deadbeef@webrtc.org,mbonadei@webrtc.org,pthatcher@webrtc.org,qingsi@google.com
> > >
> > > # Not skipping CQ checks because original CL landed > 1 day ago.
> > >
> > > Bug: webrtc:9313
> > > Change-Id: I98442346babb5d8953d37dc5825efaf79804ed7f
> > > Reviewed-on: https://webrtc-review.googlesource.com/85000
> > > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> > > Commit-Queue: Qingsi Wang <qingsi@webrtc.org>
> > > Cr-Commit-Position: refs/heads/master@{#23720}
> >
> > TBR=deadbeef@webrtc.org,mbonadei@webrtc.org,pthatcher@webrtc.org,qingsi@google.com,qingsi@webrtc.org
> >
> > # Not skipping CQ checks because original CL landed > 1 day ago.
> >
> > Bug: webrtc:9313
> > Change-Id: Ie5da4133a371532f717af144f183e299e759f152
> > Reviewed-on: https://webrtc-review.googlesource.com/95340
> > Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> > Reviewed-by: Qingsi Wang <qingsi@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#24374}
>
> TBR=deadbeef@webrtc.org,mbonadei@webrtc.org,pthatcher@webrtc.org,qingsi@google.com,qingsi@webrtc.org
>
> Change-Id: I52bf487d441ce8ccedee7e348b9ed9ade0fd9d1c
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:9313
> Reviewed-on: https://webrtc-review.googlesource.com/95440
> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#24379}
TBR=deadbeef@webrtc.org,mbonadei@webrtc.org,pthatcher@webrtc.org,qingsi@google.com,qingsi@webrtc.org
Change-Id: I6db41f092c55be74f6594eb729ad5f15c718fe34
Bug: webrtc:9313
Reviewed-on: https://webrtc-review.googlesource.com/95520
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24412}
2018-08-22 17:41:22 +00:00
|
|
|
void PrunePortsAndRemoveCandidates(
|
2016-09-19 16:57:37 -07:00
|
|
|
const std::vector<PortData*>& port_data_list);
|
2016-07-01 13:59:29 -07:00
|
|
|
// Gets filtered and sanitized candidates generated from a port and
|
|
|
|
|
// append to |candidates|.
|
|
|
|
|
void GetCandidatesFromPort(const PortData& data,
|
|
|
|
|
std::vector<Candidate>* candidates) const;
|
2016-06-30 20:52:02 -07:00
|
|
|
Port* GetBestTurnPortForNetwork(const std::string& network_name) const;
|
|
|
|
|
// Returns true if at least one TURN port is pruned.
|
|
|
|
|
bool PruneTurnPorts(Port* newly_pairable_turn_port);
|
2019-10-14 11:27:50 -07:00
|
|
|
bool PruneNewlyPairableTurnPort(PortData* newly_pairable_turn_port);
|
2016-06-30 20:52:02 -07:00
|
|
|
|
2014-10-28 22:20:11 +00:00
|
|
|
BasicPortAllocator* allocator_;
|
|
|
|
|
rtc::Thread* network_thread_;
|
2016-04-27 07:22:53 -07:00
|
|
|
std::unique_ptr<rtc::PacketSocketFactory> owned_socket_factory_;
|
2014-10-28 22:20:11 +00:00
|
|
|
rtc::PacketSocketFactory* socket_factory_;
|
|
|
|
|
bool allocation_started_;
|
|
|
|
|
bool network_manager_started_;
|
|
|
|
|
bool allocation_sequences_created_;
|
|
|
|
|
std::vector<PortConfiguration*> configs_;
|
|
|
|
|
std::vector<AllocationSequence*> sequences_;
|
|
|
|
|
std::vector<PortData> ports_;
|
2016-05-23 16:02:19 -07:00
|
|
|
uint32_t candidate_filter_ = CF_ALL;
|
2019-10-14 11:27:50 -07:00
|
|
|
// Policy on how to prune turn ports, taken from the port allocator.
|
|
|
|
|
webrtc::PortPrunePolicy turn_port_prune_policy_;
|
2016-07-01 17:31:12 -07:00
|
|
|
SessionState state_ = SessionState::CLEARED;
|
2014-10-28 22:20:11 +00:00
|
|
|
|
|
|
|
|
friend class AllocationSequence;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
// Records configuration information useful in creating ports.
|
2015-11-11 12:55:10 -08:00
|
|
|
// TODO(deadbeef): Rename "relay" to "turn_server" in this struct.
|
2018-10-15 17:15:12 +02:00
|
|
|
struct RTC_EXPORT PortConfiguration : public rtc::MessageData {
|
2014-10-28 22:20:11 +00:00
|
|
|
// TODO(jiayl): remove |stun_address| when Chrome is updated.
|
|
|
|
|
rtc::SocketAddress stun_address;
|
|
|
|
|
ServerAddresses stun_servers;
|
|
|
|
|
std::string username;
|
|
|
|
|
std::string password;
|
2019-10-29 12:45:34 -07:00
|
|
|
bool use_turn_server_as_stun_server_disabled = false;
|
2014-10-28 22:20:11 +00:00
|
|
|
|
|
|
|
|
typedef std::vector<RelayServerConfig> RelayList;
|
|
|
|
|
RelayList relays;
|
|
|
|
|
|
|
|
|
|
// TODO(jiayl): remove this ctor when Chrome is updated.
|
|
|
|
|
PortConfiguration(const rtc::SocketAddress& stun_address,
|
|
|
|
|
const std::string& username,
|
|
|
|
|
const std::string& password);
|
|
|
|
|
|
|
|
|
|
PortConfiguration(const ServerAddresses& stun_servers,
|
|
|
|
|
const std::string& username,
|
|
|
|
|
const std::string& password);
|
|
|
|
|
|
2017-10-30 16:23:38 -07:00
|
|
|
~PortConfiguration() override;
|
|
|
|
|
|
2015-07-16 10:22:21 -07:00
|
|
|
// Returns addresses of both the explicitly configured STUN servers,
|
|
|
|
|
// and TURN servers that should be used as STUN servers.
|
2014-10-28 22:20:11 +00:00
|
|
|
ServerAddresses StunServers();
|
|
|
|
|
|
|
|
|
|
// Adds another relay server, with the given ports and modifier, to the list.
|
|
|
|
|
void AddRelay(const RelayServerConfig& config);
|
|
|
|
|
|
|
|
|
|
// Determines whether the given relay server supports the given protocol.
|
|
|
|
|
bool SupportsProtocol(const RelayServerConfig& relay,
|
|
|
|
|
ProtocolType type) const;
|
2019-11-04 08:49:12 +01:00
|
|
|
bool SupportsProtocol(ProtocolType type) const;
|
2014-10-28 22:20:11 +00:00
|
|
|
// Helper method returns the server addresses for the matching RelayType and
|
|
|
|
|
// Protocol type.
|
2019-11-04 08:49:12 +01:00
|
|
|
ServerAddresses GetRelayServerAddresses(ProtocolType type) const;
|
2014-10-28 22:20:11 +00:00
|
|
|
};
|
|
|
|
|
|
2015-07-17 16:21:55 -07:00
|
|
|
class UDPPort;
|
|
|
|
|
class TurnPort;
|
|
|
|
|
|
|
|
|
|
// Performs the allocation of ports, in a sequenced (timed) manner, for a given
|
|
|
|
|
// network and IP address.
|
|
|
|
|
class AllocationSequence : public rtc::MessageHandler,
|
|
|
|
|
public sigslot::has_slots<> {
|
|
|
|
|
public:
|
|
|
|
|
enum State {
|
|
|
|
|
kInit, // Initial state.
|
|
|
|
|
kRunning, // Started allocating ports.
|
|
|
|
|
kStopped, // Stopped from running.
|
|
|
|
|
kCompleted, // All ports are allocated.
|
|
|
|
|
|
|
|
|
|
// kInit --> kRunning --> {kCompleted|kStopped}
|
|
|
|
|
};
|
|
|
|
|
AllocationSequence(BasicPortAllocatorSession* session,
|
|
|
|
|
rtc::Network* network,
|
|
|
|
|
PortConfiguration* config,
|
Use suffixed {uint,int}{8,16,32,64}_t types.
Removes the use of uint8, etc. in favor of uint8_t.
BUG=webrtc:5024
R=henrik.lundin@webrtc.org, henrikg@webrtc.org, perkj@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, tina.legrand@webrtc.org
Review URL: https://codereview.webrtc.org/1362503003 .
Cr-Commit-Position: refs/heads/master@{#10196}
2015-10-07 12:23:21 +02:00
|
|
|
uint32_t flags);
|
2017-10-30 16:23:38 -07:00
|
|
|
~AllocationSequence() override;
|
2016-08-23 15:47:33 -07:00
|
|
|
void Init();
|
2015-07-17 16:21:55 -07:00
|
|
|
void Clear();
|
2016-07-01 13:59:29 -07:00
|
|
|
void OnNetworkFailed();
|
2015-07-17 16:21:55 -07:00
|
|
|
|
|
|
|
|
State state() const { return state_; }
|
2016-07-01 13:59:29 -07:00
|
|
|
rtc::Network* network() const { return network_; }
|
|
|
|
|
|
|
|
|
|
bool network_failed() const { return network_failed_; }
|
|
|
|
|
void set_network_failed() { network_failed_ = true; }
|
2015-07-17 16:21:55 -07:00
|
|
|
|
|
|
|
|
// Disables the phases for a new sequence that this one already covers for an
|
|
|
|
|
// equivalent network setup.
|
|
|
|
|
void DisableEquivalentPhases(rtc::Network* network,
|
|
|
|
|
PortConfiguration* config,
|
Use suffixed {uint,int}{8,16,32,64}_t types.
Removes the use of uint8, etc. in favor of uint8_t.
BUG=webrtc:5024
R=henrik.lundin@webrtc.org, henrikg@webrtc.org, perkj@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, tina.legrand@webrtc.org
Review URL: https://codereview.webrtc.org/1362503003 .
Cr-Commit-Position: refs/heads/master@{#10196}
2015-10-07 12:23:21 +02:00
|
|
|
uint32_t* flags);
|
2015-07-17 16:21:55 -07:00
|
|
|
|
|
|
|
|
// Starts and stops the sequence. When started, it will continue allocating
|
|
|
|
|
// new ports on its own timed schedule.
|
|
|
|
|
void Start();
|
|
|
|
|
void Stop();
|
|
|
|
|
|
|
|
|
|
// MessageHandler
|
2017-10-30 16:23:38 -07:00
|
|
|
void OnMessage(rtc::Message* msg) override;
|
2015-07-17 16:21:55 -07:00
|
|
|
|
|
|
|
|
// Signal from AllocationSequence, when it's done with allocating ports.
|
|
|
|
|
// This signal is useful, when port allocation fails which doesn't result
|
|
|
|
|
// in any candidates. Using this signal BasicPortAllocatorSession can send
|
|
|
|
|
// its candidate discovery conclusion signal. Without this signal,
|
|
|
|
|
// BasicPortAllocatorSession doesn't have any event to trigger signal. This
|
|
|
|
|
// can also be achieved by starting timer in BPAS.
|
|
|
|
|
sigslot::signal1<AllocationSequence*> SignalPortAllocationComplete;
|
|
|
|
|
|
|
|
|
|
protected:
|
|
|
|
|
// For testing.
|
|
|
|
|
void CreateTurnPort(const RelayServerConfig& config);
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
typedef std::vector<ProtocolType> ProtocolList;
|
|
|
|
|
|
Use suffixed {uint,int}{8,16,32,64}_t types.
Removes the use of uint8, etc. in favor of uint8_t.
BUG=webrtc:5024
R=henrik.lundin@webrtc.org, henrikg@webrtc.org, perkj@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, tina.legrand@webrtc.org
Review URL: https://codereview.webrtc.org/1362503003 .
Cr-Commit-Position: refs/heads/master@{#10196}
2015-10-07 12:23:21 +02:00
|
|
|
bool IsFlagSet(uint32_t flag) { return ((flags_ & flag) != 0); }
|
2015-07-17 16:21:55 -07:00
|
|
|
void CreateUDPPorts();
|
|
|
|
|
void CreateTCPPorts();
|
|
|
|
|
void CreateStunPorts();
|
|
|
|
|
void CreateRelayPorts();
|
|
|
|
|
|
|
|
|
|
void OnReadPacket(rtc::AsyncPacketSocket* socket,
|
|
|
|
|
const char* data,
|
|
|
|
|
size_t size,
|
|
|
|
|
const rtc::SocketAddress& remote_addr,
|
2018-11-05 13:01:41 +01:00
|
|
|
const int64_t& packet_time_us);
|
2015-07-17 16:21:55 -07:00
|
|
|
|
|
|
|
|
void OnPortDestroyed(PortInterface* port);
|
|
|
|
|
|
|
|
|
|
BasicPortAllocatorSession* session_;
|
2016-07-01 13:59:29 -07:00
|
|
|
bool network_failed_ = false;
|
2015-07-17 16:21:55 -07:00
|
|
|
rtc::Network* network_;
|
Make Port (and subclasses) fully "Network"-based, instead of IP-based.
For ICE, we want sockets that are bound to specific network interfaces,
rather than to specific IP addresses. So, a while ago, we added a
"Network" class that gets passed into the Port constructor, in
addition to the IP address as before.
But we never finished the job of removing the IP address field, such that
a Port only guarantees something about the network interface it's
associated with, and not the specific IP address it ends up with.
This CL does that, and as a consequence, if a port ends up bound to
an IP address other than the "best" one (returned by Network::GetBestIP),
this *won't* be treated as an error.
This is relevant to Android, where even though we pass an IP address
into "Bind" as a way of identifying the network, the socket actually
gets bound using "android_setsocknetwork", which doesn't provide any
guarantees about the IP address. So, if a network interface has multiple
IPv6 addresses (for instance), we may not correctly predict the one
the OS will choose, and that's ok.
This CL also moves "SetAlternateLocalAddress" from VirtualSocket to
VirtualSocketServer, which makes for much more readable test code.
The next step, if there is one, is to pass along the Network class all
the way to SocketServer::Bind. Then the socket server could do smart
things with the network information. We could even stick a platform-
specific network handle in the Network object, such that the socket
server could use it for the binding, or for "sendmsg", for example.
See bug 7026 for more context about the sendmsg idea.
BUG=webrtc:7715
Review-Url: https://codereview.webrtc.org/2989303002
Cr-Commit-Position: refs/heads/master@{#19251}
2017-08-04 15:01:57 -07:00
|
|
|
// Compared with the new best IP in DisableEquivalentPhases.
|
|
|
|
|
rtc::IPAddress previous_best_ip_;
|
2015-07-17 16:21:55 -07:00
|
|
|
PortConfiguration* config_;
|
|
|
|
|
State state_;
|
Use suffixed {uint,int}{8,16,32,64}_t types.
Removes the use of uint8, etc. in favor of uint8_t.
BUG=webrtc:5024
R=henrik.lundin@webrtc.org, henrikg@webrtc.org, perkj@webrtc.org, solenberg@webrtc.org, stefan@webrtc.org, tina.legrand@webrtc.org
Review URL: https://codereview.webrtc.org/1362503003 .
Cr-Commit-Position: refs/heads/master@{#10196}
2015-10-07 12:23:21 +02:00
|
|
|
uint32_t flags_;
|
2015-07-17 16:21:55 -07:00
|
|
|
ProtocolList protocols_;
|
2016-04-27 07:22:53 -07:00
|
|
|
std::unique_ptr<rtc::AsyncPacketSocket> udp_socket_;
|
2015-07-17 16:21:55 -07:00
|
|
|
// There will be only one udp port per AllocationSequence.
|
|
|
|
|
UDPPort* udp_port_;
|
2017-12-18 12:10:43 +01:00
|
|
|
std::vector<Port*> relay_ports_;
|
2015-07-17 16:21:55 -07:00
|
|
|
int phase_;
|
|
|
|
|
};
|
|
|
|
|
|
2014-10-28 22:20:11 +00:00
|
|
|
} // namespace cricket
|
|
|
|
|
|
2019-01-11 09:11:00 -08:00
|
|
|
#endif // P2P_CLIENT_BASIC_PORT_ALLOCATOR_H_
|