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

Remove more ProxyInfo references.

Browse source 
This removes many references to the unsupported ProxyInfo struct
but leaves temporary implementations for methods while downstream
code gets updated.

Bug: none
Change-Id: Iab4410b362a8296b2e00cf71080010e515f9f4ba
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/344660
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#42096}
This commit is contained in:
Tommi 2024-04-17 10:52:53 +02:00 committed by WebRTC LUCI CQ
parent 29abba982c
commit db6767dd0c
9 changed files with 26 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
api/packet_socket_factory.h
View file

@ -64,12 +64,30 @@ class RTC_EXPORT PacketSocketFactory {
uint16_t max_port,
int opts) = 0;
virtual AsyncPacketSocket* CreateClientTcpSocket(
// TODO(tommi): Remove once implementations outside of webrtc have been moved
// over to the `CreateClientTcpSocket` variant that does not use ProxyInfo.
[[deprecated]] virtual AsyncPacketSocket* CreateClientTcpSocket(
const SocketAddress& local_address,
const SocketAddress& remote_address,
const ProxyInfo& proxy_info,
const std::string& user_agent,
const PacketSocketTcpOptions& tcp_options) = 0;
const PacketSocketTcpOptions& tcp_options) {
return CreateClientTcpSocket(local_address, remote_address, tcp_options);
}
// TODO(tommi): Make pure virtual. This temporary implementation is for
// derived classes outside of webrtc that don't override this function but
// override the deprecated version instead.
virtual AsyncPacketSocket* CreateClientTcpSocket(
const SocketAddress& local_address,
const SocketAddress& remote_address,
const PacketSocketTcpOptions& tcp_options) {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
return CreateClientTcpSocket(local_address, remote_address, ProxyInfo(),
std::string(), tcp_options);
#pragma clang diagnostic pop
}
virtual std::unique_ptr<webrtc::AsyncDnsResolverInterface>
CreateAsyncDnsResolver() = 0;

2
api/test/mock_packet_socket_factory.h
View file

@ -32,8 +32,6 @@ class MockPacketSocketFactory : public PacketSocketFactory {
CreateClientTcpSocket,
(const SocketAddress& local_address,
const SocketAddress&,
const ProxyInfo&,
const std::string&,
const PacketSocketTcpOptions&),
(override));
MOCK_METHOD(std::unique_ptr<webrtc::AsyncDnsResolverInterface>,

2
p2p/base/basic_packet_socket_factory.cc
View file

@ -86,8 +86,6 @@ AsyncListenSocket* BasicPacketSocketFactory::CreateServerTcpSocket(
AsyncPacketSocket* BasicPacketSocketFactory::CreateClientTcpSocket(
const SocketAddress& local_address,
const SocketAddress& remote_address,
const ProxyInfo& proxy_info,
const std::string& user_agent,
const PacketSocketTcpOptions& tcp_options) {
Socket* socket =
socket_factory_->CreateSocket(local_address.family(), SOCK_STREAM);

2
p2p/base/basic_packet_socket_factory.h
View file

@ -44,8 +44,6 @@ class RTC_EXPORT BasicPacketSocketFactory : public PacketSocketFactory {
AsyncPacketSocket* CreateClientTcpSocket(
const SocketAddress& local_address,
const SocketAddress& remote_address,
const ProxyInfo& proxy_info,
const std::string& user_agent,
const PacketSocketTcpOptions& tcp_options) override;
std::unique_ptr<webrtc::AsyncDnsResolverInterface> CreateAsyncDnsResolver()

7
p2p/base/port.h
View file

@ -322,16 +322,17 @@ class RTC_EXPORT Port : public PortInterface, public sigslot::has_slots<> {
const rtc::SocketAddress& addr,
const std::vector<uint16_t>& unknown_types);
void set_proxy(absl::string_view user_agent, const rtc::ProxyInfo& proxy) {
[[deprecated]] void set_proxy(absl::string_view user_agent,
const rtc::ProxyInfo& proxy) {
RTC_DCHECK_NOTREACHED();
user_agent_ = std::string(user_agent);
proxy_ = proxy;
}
const std::string& user_agent() override {
[[deprecated]] const std::string& user_agent() override {
RTC_DCHECK_NOTREACHED();
return user_agent_;
}
const rtc::ProxyInfo& proxy() override {
[[deprecated]] const rtc::ProxyInfo& proxy() override {
RTC_DCHECK_NOTREACHED();
return proxy_;
}

2
p2p/base/port_unittest.cc
View file

@ -1062,8 +1062,6 @@ class FakePacketSocketFactory : public rtc::PacketSocketFactory {
AsyncPacketSocket* CreateClientTcpSocket(
const SocketAddress& local_address,
const SocketAddress& remote_address,
const rtc::ProxyInfo& proxy_info,
const std::string& user_agent,
const rtc::PacketSocketTcpOptions& opts) override {
EXPECT_TRUE(next_client_tcp_socket_.has_value());
AsyncPacketSocket* result = *next_client_tcp_socket_;

2
p2p/base/tcp_port.cc
View file

@ -596,7 +596,7 @@ void TCPConnection::CreateOutgoingTcpSocket() {
tcp_opts.opts = opts;
socket_.reset(port()->socket_factory()->CreateClientTcpSocket(
rtc::SocketAddress(port()->Network()->GetBestIP(), 0),
remote_candidate().address(), rtc::ProxyInfo(), std::string(), tcp_opts));
remote_candidate().address(), tcp_opts));
if (socket_) {
RTC_LOG(LS_VERBOSE) << ToString() << ": Connecting from "
<< socket_->GetLocalAddress().ToSensitiveString()

2
p2p/base/turn_port.cc
View file

@ -439,7 +439,7 @@ bool TurnPort::CreateTurnClientSocket() {
tcp_options.tls_cert_verifier = tls_cert_verifier_;
socket_ = socket_factory()->CreateClientTcpSocket(
rtc::SocketAddress(Network()->GetBestIP(), 0), server_address_.address,
rtc::ProxyInfo(), std::string(), tcp_options);
tcp_options);
}
if (!socket_) {

2
test/network/emulated_turn_server.cc
View file

@ -49,8 +49,6 @@ class PacketSocketFactoryWrapper : public rtc::PacketSocketFactory {
rtc::AsyncPacketSocket* CreateClientTcpSocket(
const rtc::SocketAddress& local_address,
const rtc::SocketAddress& remote_address,
const rtc::ProxyInfo& proxy_info,
const std::string& user_agent,
const rtc::PacketSocketTcpOptions& tcp_options) override {
return nullptr;
}