This reverts commit acf8ccb3c9f001b0ed749aca52b2d436d66f9586. Reason for revert: Speculative revert for https://ci.chromium.org/ui/p/chromium/builders/try/win10_chromium_x64_rel_ng/b8851745102358680592/overview. Original change's description: > Use the new DNS resolver API in PeerConnection > > Bug: webrtc:12598 > Change-Id: I5a14058e7f28c993ed927749df7357c715ba83fb > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/212961 > Reviewed-by: Niels Moller <nisse@webrtc.org> > Commit-Queue: Harald Alvestrand <hta@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#33561} # Not skipping CQ checks because original CL landed > 1 day ago. TBR=hta@webrtc.org Bug: webrtc:12598 Change-Id: Idc9853cb569849c49052f9cbd865614710fff979 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/213188 Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33591}
68 lines
2.1 KiB
C++
68 lines
2.1 KiB
C++
/*
|
|
* Copyright 2019 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 "api/ice_transport_factory.h"
|
|
|
|
#include <memory>
|
|
#include <utility>
|
|
|
|
#include "p2p/base/ice_transport_internal.h"
|
|
#include "p2p/base/p2p_constants.h"
|
|
#include "p2p/base/p2p_transport_channel.h"
|
|
#include "p2p/base/port_allocator.h"
|
|
#include "rtc_base/thread.h"
|
|
|
|
namespace webrtc {
|
|
|
|
namespace {
|
|
|
|
// This implementation of IceTransportInterface is used in cases where
|
|
// the only reference to the P2PTransport will be through this class.
|
|
// It must be constructed, accessed and destroyed on the signaling thread.
|
|
class IceTransportWithTransportChannel : public IceTransportInterface {
|
|
public:
|
|
IceTransportWithTransportChannel(
|
|
std::unique_ptr<cricket::IceTransportInternal> internal)
|
|
: internal_(std::move(internal)) {}
|
|
|
|
~IceTransportWithTransportChannel() override {
|
|
RTC_DCHECK_RUN_ON(&thread_checker_);
|
|
}
|
|
|
|
cricket::IceTransportInternal* internal() override {
|
|
RTC_DCHECK_RUN_ON(&thread_checker_);
|
|
return internal_.get();
|
|
}
|
|
|
|
private:
|
|
const SequenceChecker thread_checker_{};
|
|
const std::unique_ptr<cricket::IceTransportInternal> internal_
|
|
RTC_GUARDED_BY(thread_checker_);
|
|
};
|
|
|
|
} // namespace
|
|
|
|
rtc::scoped_refptr<IceTransportInterface> CreateIceTransport(
|
|
cricket::PortAllocator* port_allocator) {
|
|
IceTransportInit init;
|
|
init.set_port_allocator(port_allocator);
|
|
return CreateIceTransport(std::move(init));
|
|
}
|
|
|
|
rtc::scoped_refptr<IceTransportInterface> CreateIceTransport(
|
|
IceTransportInit init) {
|
|
return new rtc::RefCountedObject<IceTransportWithTransportChannel>(
|
|
std::make_unique<cricket::P2PTransportChannel>(
|
|
"", cricket::ICE_CANDIDATE_COMPONENT_RTP, init.port_allocator(),
|
|
init.async_resolver_factory(), init.event_log()));
|
|
}
|
|
|
|
} // namespace webrtc
|