mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-14 14:20:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use AsyncDnsResolver API in bindings and tests

Browse source 
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}
This commit is contained in:
Harald Alvestrand 2021-10-06 09:34:40 +00:00 committed by WebRTC LUCI CQ
parent 408e4da26f
commit a0577605b0
5 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
p2p/BUILD.gn
View file

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

11
p2p/base/basic_packet_socket_factory.cc
View file

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

11
p2p/base/basic_packet_socket_factory.h
View file

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

5
p2p/base/port_unittest.cc
View file

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

3
test/network/emulated_turn_server.cc
View file

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