Reason for revert:
Breaks Chromium build due to the changed constructor in webrtc/p2p/client/basicportallocator.h.
Build (example): https://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/19739.
Log:
FAILED: obj/remoting/protocol/protocol/port_allocator.o
/b/c/goma_client/gomacc ../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/remoting/protocol/protocol/port_allocator.o.d -DV8_DEPRECATION_WARNINGS -DUSE_UDEV -DUSE_AURA=1 -DUSE_PANGO=1 -DUSE_CAIRO=1 -DUSE_GLIB=1 -DUSE_NSS_CERTS=1 -DUSE_X11=1 -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DCHROMIUM_BUILD -DFIELDTRIAL_TESTING_ENABLED -DCR_CLANG_REVISION=\"310694-2\" -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DCOMPONENT_BUILD -D_DEBUG -DDYNAMIC_ANNOTATIONS_ENABLED=1 -DWTF_USE_DYNAMIC_ANNOTATIONS=1 -D_GLIBCXX_DEBUG=1 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32 -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26 -DEXPAT_RELATIVE_PATH -DGL_GLEXT_PROTOTYPES -DUSE_GLX -DUSE_EGL -DGOOGLE_PROTOBUF_NO_RTTI -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DHAVE_PTHREAD -DPROTOBUF_USE_DLLS -DWEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0 -DFEATURE_ENABLE_VOICEMAIL -DGTEST_RELATIVE_PATH -DWEBRTC_CHROMIUM_BUILD -DWEBRTC_POSIX -DWEBRTC_LINUX -DBORINGSSL_SHARED_LIBRARY -I../.. -Igen -I../../build/linux/debian_jessie_amd64-sysroot/usr/include/glib-2.0 -I../../build/linux/debian_jessie_amd64-sysroot/usr/lib/x86_64-linux-gnu/glib-2.0/include -I../../third_party/libwebp/src -I../../third_party/khronos -I../../gpu -I../../third_party/protobuf/src -Igen/protoc_out -I../../third_party/protobuf/src -I../../third_party/webrtc_overrides -I../../testing/gtest/include -I../../third_party -I../../third_party/webrtc_overrides -I../../third_party -I../../third_party/boringssl/src/include -I../../build/linux/debian_jessie_amd64-sysroot/usr/include/nss -I../../build/linux/debian_jessie_amd64-sysroot/usr/include/nspr -I../../third_party/libyuv/include -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -Wno-builtin-macro-redefined -D__DATE__= -D__TIME__= -D__TIMESTAMP__= -funwind-tables -fPIC -pipe -B../../third_party/binutils/Linux_x64/Release/bin -pthread -fcolor-diagnostics -fdebug-prefix-map=/b/c/b/Linux_Builder__dbg_/src=. -m64 -march=x86-64 -Wall -Werror -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Wno-c++11-narrowing -Wno-covered-switch-default -Wno-unneeded-internal-declaration -Wno-inconsistent-missing-override -Wno-undefined-var-template -Wno-nonportable-include-path -Wno-address-of-packed-member -Wno-unused-lambda-capture -Wno-user-defined-warnings -Wno-enum-compare-switch -O0 -fno-omit-frame-pointer -g2 -gsplit-dwarf -fvisibility=hidden -Xclang -load -Xclang ../../third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so -Xclang -add-plugin -Xclang find-bad-constructs -Xclang -plugin-arg-find-bad-constructs -Xclang check-auto-raw-pointer -Xclang -plugin-arg-find-bad-constructs -Xclang check-ipc -Wheader-hygiene -Wstring-conversion -Wtautological-overlap-compare -Wexit-time-destructors -Wno-header-guard -Wno-undefined-bool-conversion -Wno-tautological-undefined-compare -std=gnu++14 -fno-rtti -nostdinc++ -isystem../../buildtools/third_party/libc++/trunk/include -isystem../../buildtools/third_party/libc++abi/trunk/include --sysroot=../../build/linux/debian_jessie_amd64-sysroot -fno-exceptions -fvisibility-inlines-hidden -c ../../remoting/protocol/port_allocator.cc -o obj/remoting/protocol/protocol/port_allocator.o
../../remoting/protocol/port_allocator.cc:48:7: error: no matching constructor for initialization of 'cricket::BasicPortAllocator'
: BasicPortAllocator(network_manager.get(), socket_factory.get()),
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../../third_party/webrtc/p2p/client/basicportallocator.h:35:12: note: candidate constructor not viable: requires single argument 'network_manager', but 2 arguments were provided
explicit BasicPortAllocator(rtc::NetworkManager* network_manager);
^
../../third_party/webrtc/p2p/client/basicportallocator.h:30:7: note: candidate constructor (the implicit copy constructor) not viable: requires 1 argument, but 2 were provided
class BasicPortAllocator : public PortAllocator {
^
../../third_party/webrtc/p2p/client/basicportallocator.h:32:3: note: candidate constructor not viable: requires 3 arguments, but 2 were provided
BasicPortAllocator(rtc::NetworkManager* network_manager,
^
../../third_party/webrtc/p2p/client/basicportallocator.h:36:3: note: candidate constructor not viable: requires 3 arguments, but 2 were provided
BasicPortAllocator(rtc::NetworkManager* network_manager,
^
../../third_party/webrtc/p2p/client/basicportallocator.h:39:3: note: candidate constructor not viable: requires 5 arguments, but 2 were provided
BasicPortAllocator(rtc::NetworkManager* network_manager,
^
1 error generated.
Original issue's description:
> Add logging host lookups made by TurnPort to the RtcEventLog.
>
> The following fields are logged:
> - error, if there was an error.
> - elapsed time in milliseconds
>
> BUG=webrtc:8100
>
> Review-Url: https://codereview.webrtc.org/2996933003
> Cr-Commit-Position: refs/heads/master@{#19574}
> Committed: c251cb13c0
TBR=terelius@webrtc.org,pthatcher@webrtc.org,jonaso@google.com,pthatcher@google.com,solenberg@webrtc.org,deadbeef@webrtc.org,jonaso@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:8100
Review-Url: https://codereview.webrtc.org/3012473002
Cr-Commit-Position: refs/heads/master@{#19578}
384 lines
14 KiB
C++
384 lines
14 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.
|
|
*/
|
|
|
|
#ifndef WEBRTC_P2P_CLIENT_BASICPORTALLOCATOR_H_
|
|
#define WEBRTC_P2P_CLIENT_BASICPORTALLOCATOR_H_
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "webrtc/p2p/base/portallocator.h"
|
|
#include "webrtc/rtc_base/checks.h"
|
|
#include "webrtc/rtc_base/messagequeue.h"
|
|
#include "webrtc/rtc_base/network.h"
|
|
#include "webrtc/rtc_base/thread.h"
|
|
|
|
namespace cricket {
|
|
|
|
class BasicPortAllocator : public PortAllocator {
|
|
public:
|
|
BasicPortAllocator(rtc::NetworkManager* network_manager,
|
|
rtc::PacketSocketFactory* socket_factory);
|
|
explicit BasicPortAllocator(rtc::NetworkManager* network_manager);
|
|
BasicPortAllocator(rtc::NetworkManager* network_manager,
|
|
rtc::PacketSocketFactory* socket_factory,
|
|
const ServerAddresses& stun_servers);
|
|
BasicPortAllocator(rtc::NetworkManager* network_manager,
|
|
const ServerAddresses& stun_servers,
|
|
const rtc::SocketAddress& relay_server_udp,
|
|
const rtc::SocketAddress& relay_server_tcp,
|
|
const rtc::SocketAddress& relay_server_ssl);
|
|
virtual ~BasicPortAllocator();
|
|
|
|
// Set to kDefaultNetworkIgnoreMask by default.
|
|
void SetNetworkIgnoreMask(int network_ignore_mask) override {
|
|
// TODO(phoglund): implement support for other types than loopback.
|
|
// See https://code.google.com/p/webrtc/issues/detail?id=4288.
|
|
// Then remove set_network_ignore_list from NetworkManager.
|
|
network_ignore_mask_ = network_ignore_mask;
|
|
}
|
|
|
|
int network_ignore_mask() const { return network_ignore_mask_; }
|
|
|
|
rtc::NetworkManager* network_manager() const { return network_manager_; }
|
|
|
|
// If socket_factory() is set to NULL each PortAllocatorSession
|
|
// creates its own socket factory.
|
|
rtc::PacketSocketFactory* socket_factory() { return socket_factory_; }
|
|
|
|
PortAllocatorSession* CreateSessionInternal(
|
|
const std::string& content_name,
|
|
int component,
|
|
const std::string& ice_ufrag,
|
|
const std::string& ice_pwd) override;
|
|
|
|
// Convenience method that adds a TURN server to the configuration.
|
|
void AddTurnServer(const RelayServerConfig& turn_server);
|
|
|
|
private:
|
|
void Construct();
|
|
|
|
void OnIceRegathering(PortAllocatorSession* session,
|
|
IceRegatheringReason reason);
|
|
|
|
rtc::NetworkManager* network_manager_;
|
|
rtc::PacketSocketFactory* socket_factory_;
|
|
bool allow_tcp_listen_;
|
|
int network_ignore_mask_ = rtc::kDefaultNetworkIgnoreMask;
|
|
};
|
|
|
|
struct PortConfiguration;
|
|
class AllocationSequence;
|
|
|
|
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.
|
|
};
|
|
|
|
class BasicPortAllocatorSession : public PortAllocatorSession,
|
|
public rtc::MessageHandler {
|
|
public:
|
|
BasicPortAllocatorSession(BasicPortAllocator* allocator,
|
|
const std::string& content_name,
|
|
int component,
|
|
const std::string& ice_ufrag,
|
|
const std::string& ice_pwd);
|
|
~BasicPortAllocatorSession();
|
|
|
|
virtual BasicPortAllocator* allocator() { return allocator_; }
|
|
rtc::Thread* network_thread() { return network_thread_; }
|
|
rtc::PacketSocketFactory* socket_factory() { return socket_factory_; }
|
|
|
|
void SetCandidateFilter(uint32_t filter) override;
|
|
void StartGettingPorts() override;
|
|
void StopGettingPorts() override;
|
|
void ClearGettingPorts() override;
|
|
bool IsGettingPorts() override { return state_ == SessionState::GATHERING; }
|
|
bool IsCleared() const override { return state_ == SessionState::CLEARED; }
|
|
bool IsStopped() const override { return state_ == SessionState::STOPPED; }
|
|
// These will all be cricket::Ports.
|
|
std::vector<PortInterface*> ReadyPorts() const override;
|
|
std::vector<Candidate> ReadyCandidates() const override;
|
|
bool CandidatesAllocationDone() const override;
|
|
void RegatherOnFailedNetworks() override;
|
|
void RegatherOnAllNetworks() override;
|
|
void PruneAllPorts() override;
|
|
|
|
protected:
|
|
void UpdateIceParametersInternal() override;
|
|
|
|
// 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.
|
|
void OnMessage(rtc::Message* message) override;
|
|
|
|
private:
|
|
class PortData {
|
|
public:
|
|
PortData() {}
|
|
PortData(Port* port, AllocationSequence* seq)
|
|
: port_(port), sequence_(seq) {}
|
|
|
|
Port* port() const { return port_; }
|
|
AllocationSequence* sequence() const { return sequence_; }
|
|
bool has_pairable_candidate() const { return has_pairable_candidate_; }
|
|
bool complete() const { return state_ == STATE_COMPLETE; }
|
|
bool error() const { return state_ == STATE_ERROR; }
|
|
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;
|
|
}
|
|
// Sets the state to "PRUNED" and prunes the Port.
|
|
void Prune() {
|
|
state_ = STATE_PRUNED;
|
|
if (port()) {
|
|
port()->Prune();
|
|
}
|
|
}
|
|
void set_has_pairable_candidate(bool has_pairable_candidate) {
|
|
if (has_pairable_candidate) {
|
|
RTC_DCHECK(state_ == STATE_INPROGRESS);
|
|
}
|
|
has_pairable_candidate_ = has_pairable_candidate;
|
|
}
|
|
void set_complete() {
|
|
state_ = STATE_COMPLETE;
|
|
}
|
|
void set_error() {
|
|
RTC_DCHECK(state_ == STATE_INPROGRESS);
|
|
state_ = STATE_ERROR;
|
|
}
|
|
|
|
private:
|
|
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.
|
|
};
|
|
Port* port_ = nullptr;
|
|
AllocationSequence* sequence_ = nullptr;
|
|
bool has_pairable_candidate_ = false;
|
|
State state_ = STATE_INPROGRESS;
|
|
};
|
|
|
|
void OnConfigReady(PortConfiguration* config);
|
|
void OnConfigStop();
|
|
void AllocatePorts();
|
|
void OnAllocate();
|
|
void DoAllocate(bool disable_equivalent_phases);
|
|
void OnNetworksChanged();
|
|
void OnAllocationSequenceObjectsCreated();
|
|
void DisableEquivalentPhases(rtc::Network* network,
|
|
PortConfiguration* config,
|
|
uint32_t* flags);
|
|
void AddAllocatedPort(Port* port, AllocationSequence* seq,
|
|
bool prepare_address);
|
|
void OnCandidateReady(Port* port, const Candidate& c);
|
|
void OnPortComplete(Port* port);
|
|
void OnPortError(Port* port);
|
|
void OnProtocolEnabled(AllocationSequence* seq, ProtocolType proto);
|
|
void OnPortDestroyed(PortInterface* port);
|
|
void MaybeSignalCandidatesAllocationDone();
|
|
void OnPortAllocationComplete(AllocationSequence* seq);
|
|
PortData* FindPort(Port* port);
|
|
std::vector<rtc::Network*> GetNetworks();
|
|
std::vector<rtc::Network*> GetFailedNetworks();
|
|
void Regather(const std::vector<rtc::Network*>& networks,
|
|
bool disable_equivalent_phases,
|
|
IceRegatheringReason reason);
|
|
|
|
bool CheckCandidateFilter(const Candidate& c) const;
|
|
bool CandidatePairable(const Candidate& c, const Port* port) const;
|
|
// Clear the related address according to the flags and candidate filter
|
|
// in order to avoid leaking any information.
|
|
Candidate SanitizeRelatedAddress(const Candidate& c) const;
|
|
|
|
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.
|
|
void PrunePortsAndRemoveCandidates(
|
|
const std::vector<PortData*>& port_data_list);
|
|
// Gets filtered and sanitized candidates generated from a port and
|
|
// append to |candidates|.
|
|
void GetCandidatesFromPort(const PortData& data,
|
|
std::vector<Candidate>* candidates) const;
|
|
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);
|
|
|
|
BasicPortAllocator* allocator_;
|
|
rtc::Thread* network_thread_;
|
|
std::unique_ptr<rtc::PacketSocketFactory> owned_socket_factory_;
|
|
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_;
|
|
uint32_t candidate_filter_ = CF_ALL;
|
|
// Whether to prune low-priority ports, taken from the port allocator.
|
|
bool prune_turn_ports_;
|
|
SessionState state_ = SessionState::CLEARED;
|
|
|
|
friend class AllocationSequence;
|
|
};
|
|
|
|
// Records configuration information useful in creating ports.
|
|
// TODO(deadbeef): Rename "relay" to "turn_server" in this struct.
|
|
struct PortConfiguration : public rtc::MessageData {
|
|
// TODO(jiayl): remove |stun_address| when Chrome is updated.
|
|
rtc::SocketAddress stun_address;
|
|
ServerAddresses stun_servers;
|
|
std::string username;
|
|
std::string password;
|
|
|
|
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);
|
|
|
|
// Returns addresses of both the explicitly configured STUN servers,
|
|
// and TURN servers that should be used as STUN servers.
|
|
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;
|
|
bool SupportsProtocol(RelayType turn_type, ProtocolType type) const;
|
|
// Helper method returns the server addresses for the matching RelayType and
|
|
// Protocol type.
|
|
ServerAddresses GetRelayServerAddresses(
|
|
RelayType turn_type, ProtocolType type) const;
|
|
};
|
|
|
|
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,
|
|
uint32_t flags);
|
|
~AllocationSequence();
|
|
void Init();
|
|
void Clear();
|
|
void OnNetworkFailed();
|
|
|
|
State state() const { return state_; }
|
|
rtc::Network* network() const { return network_; }
|
|
|
|
bool network_failed() const { return network_failed_; }
|
|
void set_network_failed() { network_failed_ = true; }
|
|
|
|
// Disables the phases for a new sequence that this one already covers for an
|
|
// equivalent network setup.
|
|
void DisableEquivalentPhases(rtc::Network* network,
|
|
PortConfiguration* config,
|
|
uint32_t* flags);
|
|
|
|
// Starts and stops the sequence. When started, it will continue allocating
|
|
// new ports on its own timed schedule.
|
|
void Start();
|
|
void Stop();
|
|
|
|
// MessageHandler
|
|
void OnMessage(rtc::Message* msg);
|
|
|
|
void EnableProtocol(ProtocolType proto);
|
|
bool ProtocolEnabled(ProtocolType proto) const;
|
|
|
|
// 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;
|
|
|
|
bool IsFlagSet(uint32_t flag) { return ((flags_ & flag) != 0); }
|
|
void CreateUDPPorts();
|
|
void CreateTCPPorts();
|
|
void CreateStunPorts();
|
|
void CreateRelayPorts();
|
|
void CreateGturnPort(const RelayServerConfig& config);
|
|
|
|
void OnReadPacket(rtc::AsyncPacketSocket* socket,
|
|
const char* data,
|
|
size_t size,
|
|
const rtc::SocketAddress& remote_addr,
|
|
const rtc::PacketTime& packet_time);
|
|
|
|
void OnPortDestroyed(PortInterface* port);
|
|
|
|
BasicPortAllocatorSession* session_;
|
|
bool network_failed_ = false;
|
|
rtc::Network* network_;
|
|
// Compared with the new best IP in DisableEquivalentPhases.
|
|
rtc::IPAddress previous_best_ip_;
|
|
PortConfiguration* config_;
|
|
State state_;
|
|
uint32_t flags_;
|
|
ProtocolList protocols_;
|
|
std::unique_ptr<rtc::AsyncPacketSocket> udp_socket_;
|
|
// There will be only one udp port per AllocationSequence.
|
|
UDPPort* udp_port_;
|
|
std::vector<TurnPort*> turn_ports_;
|
|
int phase_;
|
|
};
|
|
|
|
} // namespace cricket
|
|
|
|
#endif // WEBRTC_P2P_CLIENT_BASICPORTALLOCATOR_H_
|