From a3baf2a3b165344b85a8fafe9e674d098b98f8b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Fri, 6 Sep 2019 10:29:50 +0200 Subject: [PATCH] Add one more BasicPortAllocator constructor The new constructor takes a NetworkManager and a list of turn servers. Intended to aid migration away from using the constructor with additional relay addresses. Bug: webrtc:10947 Change-Id: If8dcdc24090cc35b929646bc78aa646e8135e4cd Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/151641 Reviewed-by: Per Kjellander Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#29095} --- p2p/client/basic_port_allocator.cc | 7 ++++++- p2p/client/basic_port_allocator.h | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/p2p/client/basic_port_allocator.cc b/p2p/client/basic_port_allocator.cc index 316bc879dd..013173ea84 100644 --- a/p2p/client/basic_port_allocator.cc +++ b/p2p/client/basic_port_allocator.cc @@ -173,13 +173,18 @@ BasicPortAllocator::BasicPortAllocator(rtc::NetworkManager* network_manager) Construct(); } +BasicPortAllocator::BasicPortAllocator(rtc::NetworkManager* network_manager, + const ServerAddresses& stun_servers) + : BasicPortAllocator(network_manager, + /*socket_factory=*/nullptr, + stun_servers) {} + BasicPortAllocator::BasicPortAllocator(rtc::NetworkManager* network_manager, rtc::PacketSocketFactory* socket_factory, const ServerAddresses& stun_servers) : network_manager_(network_manager), socket_factory_(socket_factory) { InitRelayPortFactory(nullptr); RTC_DCHECK(relay_port_factory_ != nullptr); - RTC_DCHECK(socket_factory_ != NULL); SetConfiguration(stun_servers, std::vector(), 0, false, nullptr); Construct(); diff --git a/p2p/client/basic_port_allocator.h b/p2p/client/basic_port_allocator.h index 50cb83d442..0a97db8254 100644 --- a/p2p/client/basic_port_allocator.h +++ b/p2p/client/basic_port_allocator.h @@ -36,6 +36,8 @@ class RTC_EXPORT BasicPortAllocator : public PortAllocator { webrtc::TurnCustomizer* customizer = nullptr, RelayPortFactoryInterface* relay_port_factory = nullptr); explicit BasicPortAllocator(rtc::NetworkManager* network_manager); + BasicPortAllocator(rtc::NetworkManager* network_manager, + const ServerAddresses& stun_servers); BasicPortAllocator(rtc::NetworkManager* network_manager, rtc::PacketSocketFactory* socket_factory, const ServerAddresses& stun_servers);