zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Use AsyncDnsResolver API in bindings and tests"

Browse Source 
This reverts commit a0577605b03da461719ce5b5eb0fb1ed55ad1065.

Reason for revert: Speculative revert due to downstream tests

Original change's description:
> Use AsyncDnsResolver API in bindings and tests
>
> Bug: webrtc:12598
> Change-Id: Ia4db91bf6dcd257cd85f4089dee4c7bbea433216
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/234342
> Commit-Queue: Harald Alvestrand <hta@webrtc.org>
> Commit-Queue: Markus Handell <handellm@webrtc.org>
> Reviewed-by: Markus Handell <handellm@webrtc.org>
> Cr-Commit-Position: refs/heads/main@{#35154}

TBR=hta@webrtc.org,handellm@webrtc.org,webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com

Change-Id: I57f3ff70b6374e7be670526a90dfb1651e9b1148
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:12598
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/234382
Reviewed-by: Björn Terelius <terelius@google.com>
Commit-Queue: Björn Terelius <terelius@google.com>
Cr-Commit-Position: refs/heads/main@{#35157}
This commit is contained in:
Björn Terelius
2021-10-06 15:05:33 +00:00
committed by WebRTC LUCI CQ
parent 3695640504
commit fc5a4f74ac
5 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
p2p/BUILD.gn
View File

@ -108,7 +108,6 @@ rtc_library("rtc_p2p") {
"../rtc_base:rtc_numerics",
"../rtc_base:socket",
"../rtc_base:socket_address",
"../rtc_base:socket_factory",
"../rtc_base:socket_server",
"../rtc_base:threading",
"../rtc_base/experiments:field_trial_parser",

11
p2p/base/basic_packet_socket_factory.cc
View File

@ -14,15 +14,16 @@
#include <string>
#include "api/async_dns_resolver.h"
#include "api/wrapping_async_dns_resolver.h"
#include "p2p/base/async_stun_tcp_socket.h"
#include "rtc_base/async_resolver.h"
#include "rtc_base/async_tcp_socket.h"
#include "rtc_base/async_udp_socket.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/net_helpers.h"
#include "rtc_base/socket.h"
#include "rtc_base/socket_adapters.h"
#include "rtc_base/socket_server.h"
#include "rtc_base/ssl_adapter.h"
namespace rtc {
@ -189,10 +190,8 @@ AsyncPacketSocket* BasicPacketSocketFactory::CreateClientTcpSocket(
return tcp_socket;
}
std::unique_ptr<webrtc::AsyncDnsResolverInterface>
BasicPacketSocketFactory::CreateAsyncDnsResolver() {
return std::make_unique<webrtc::WrappingAsyncDnsResolver>(
new AsyncResolver());
AsyncResolverInterface* BasicPacketSocketFactory::CreateAsyncResolver() {
return new AsyncResolver();
}
int BasicPacketSocketFactory::BindSocket(Socket* socket,

11
p2p/base/basic_packet_socket_factory.h
View File

@ -11,18 +11,10 @@
#ifndef P2P_BASE_BASIC_PACKET_SOCKET_FACTORY_H_
#define P2P_BASE_BASIC_PACKET_SOCKET_FACTORY_H_
#include <stdint.h>
#include <memory>
#include <string>
#include "api/async_dns_resolver.h"
#include "api/packet_socket_factory.h"
#include "rtc_base/async_packet_socket.h"
#include "rtc_base/proxy_info.h"
#include "rtc_base/socket.h"
#include "rtc_base/socket_address.h"
#include "rtc_base/socket_factory.h"
namespace rtc {
@ -47,8 +39,7 @@ class BasicPacketSocketFactory : public PacketSocketFactory {
const std::string& user_agent,
const PacketSocketTcpOptions& tcp_options) override;
std::unique_ptr<webrtc::AsyncDnsResolverInterface> CreateAsyncDnsResolver()
override;
AsyncResolverInterface* CreateAsyncResolver() override;
private:
int BindSocket(Socket* socket,

5
p2p/base/port_unittest.cc
View File

@ -1002,10 +1002,7 @@ class FakePacketSocketFactory : public rtc::PacketSocketFactory {
void set_next_client_tcp_socket(AsyncPacketSocket* next_client_tcp_socket) {
next_client_tcp_socket_ = next_client_tcp_socket;
}
std::unique_ptr<webrtc::AsyncDnsResolverInterface> CreateAsyncDnsResolver()
override {
return nullptr;
}
rtc::AsyncResolverInterface* CreateAsyncResolver() override { return NULL; }
private:
AsyncPacketSocket* next_udp_socket_;

3
test/network/emulated_turn_server.cc
View File

@ -101,8 +101,7 @@ class PacketSocketFactoryWrapper : public rtc::PacketSocketFactory {
const rtc::PacketSocketTcpOptions& tcp_options) override {
return nullptr;
}
std::unique_ptr<webrtc::AsyncDnsResolverInterface> CreateAsyncDnsResolver()
override {
rtc::AsyncResolverInterface* CreateAsyncResolver() override {
return nullptr;
}