mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-13 05:40:42 +01:00

This reverts commit5a40b37105
. Reason for revert: Fixed the bug and ran layout tests. Original change's description: > Revert "Use the new DNS resolver API in PeerConnection" > > This reverts commitacf8ccb3c9
. > > 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} # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:12598 Change-Id: Ief7867f2f23de66504877cdab1b23a11df2d5de4 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/214120 Commit-Queue: Harald Alvestrand <hta@webrtc.org> Reviewed-by: Tommi <tommi@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33647}
109 lines
4.3 KiB
C++
109 lines
4.3 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.
|
|
*/
|
|
|
|
#ifndef API_ICE_TRANSPORT_INTERFACE_H_
|
|
#define API_ICE_TRANSPORT_INTERFACE_H_
|
|
|
|
#include <string>
|
|
|
|
#include "api/async_dns_resolver.h"
|
|
#include "api/async_resolver_factory.h"
|
|
#include "api/rtc_error.h"
|
|
#include "api/rtc_event_log/rtc_event_log.h"
|
|
#include "api/scoped_refptr.h"
|
|
#include "rtc_base/ref_count.h"
|
|
|
|
namespace cricket {
|
|
class IceTransportInternal;
|
|
class PortAllocator;
|
|
} // namespace cricket
|
|
|
|
namespace webrtc {
|
|
|
|
// An ICE transport, as represented to the outside world.
|
|
// This object is refcounted, and is therefore alive until the
|
|
// last holder has released it.
|
|
class IceTransportInterface : public rtc::RefCountInterface {
|
|
public:
|
|
// Accessor for the internal representation of an ICE transport.
|
|
// The returned object can only be safely used on the signalling thread.
|
|
// TODO(crbug.com/907849): Add API calls for the functions that have to
|
|
// be exposed to clients, and stop allowing access to the
|
|
// cricket::IceTransportInternal API.
|
|
virtual cricket::IceTransportInternal* internal() = 0;
|
|
};
|
|
|
|
struct IceTransportInit final {
|
|
public:
|
|
IceTransportInit() = default;
|
|
IceTransportInit(const IceTransportInit&) = delete;
|
|
IceTransportInit(IceTransportInit&&) = default;
|
|
IceTransportInit& operator=(const IceTransportInit&) = delete;
|
|
IceTransportInit& operator=(IceTransportInit&&) = default;
|
|
|
|
cricket::PortAllocator* port_allocator() { return port_allocator_; }
|
|
void set_port_allocator(cricket::PortAllocator* port_allocator) {
|
|
port_allocator_ = port_allocator;
|
|
}
|
|
|
|
AsyncDnsResolverFactoryInterface* async_dns_resolver_factory() {
|
|
return async_dns_resolver_factory_;
|
|
}
|
|
void set_async_dns_resolver_factory(
|
|
AsyncDnsResolverFactoryInterface* async_dns_resolver_factory) {
|
|
RTC_DCHECK(!async_resolver_factory_);
|
|
async_dns_resolver_factory_ = async_dns_resolver_factory;
|
|
}
|
|
AsyncResolverFactory* async_resolver_factory() {
|
|
return async_resolver_factory_;
|
|
}
|
|
ABSL_DEPRECATED("bugs.webrtc.org/12598")
|
|
void set_async_resolver_factory(
|
|
AsyncResolverFactory* async_resolver_factory) {
|
|
RTC_DCHECK(!async_dns_resolver_factory_);
|
|
async_resolver_factory_ = async_resolver_factory;
|
|
}
|
|
|
|
RtcEventLog* event_log() { return event_log_; }
|
|
void set_event_log(RtcEventLog* event_log) { event_log_ = event_log; }
|
|
|
|
private:
|
|
cricket::PortAllocator* port_allocator_ = nullptr;
|
|
AsyncDnsResolverFactoryInterface* async_dns_resolver_factory_ = nullptr;
|
|
// For backwards compatibility. Only one resolver factory can be set.
|
|
AsyncResolverFactory* async_resolver_factory_ = nullptr;
|
|
RtcEventLog* event_log_ = nullptr;
|
|
// TODO(https://crbug.com/webrtc/12657): Redesign to have const members.
|
|
};
|
|
|
|
// TODO(qingsi): The factory interface is defined in this file instead of its
|
|
// namesake file ice_transport_factory.h to avoid the extra dependency on p2p/
|
|
// introduced there by the p2p/-dependent factory methods. Move the factory
|
|
// methods to a different file or rename it.
|
|
class IceTransportFactory {
|
|
public:
|
|
virtual ~IceTransportFactory() = default;
|
|
// As a refcounted object, the returned ICE transport may outlive the host
|
|
// construct into which its reference is given, e.g. a peer connection. As a
|
|
// result, the returned ICE transport should not hold references to any object
|
|
// that the transport does not own and that has a lifetime bound to the host
|
|
// construct. Also, assumptions on the thread safety of the returned transport
|
|
// should be clarified by implementations. For example, a peer connection
|
|
// requires the returned transport to be constructed and destroyed on the
|
|
// network thread and an ICE transport factory that intends to work with a
|
|
// peer connection should offer transports compatible with these assumptions.
|
|
virtual rtc::scoped_refptr<IceTransportInterface> CreateIceTransport(
|
|
const std::string& transport_name,
|
|
int component,
|
|
IceTransportInit init) = 0;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
#endif // API_ICE_TRANSPORT_INTERFACE_H_
|