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

Delete deprecated STUN origin methods/fields.

Browse Source 
Follow up to https://webrtc-review.googlesource.com/c/src/+/236260,
after removing use of deprecated methods/fields downstream.

Bug: webrtc:12132
Change-Id: Ic954c5c6785f30e327353e609fd5d55396f15810
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/237164
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Taylor Brandstetter <deadbeef@webrtc.org>
Commit-Queue: Taylor Brandstetter <deadbeef@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35305}
This commit is contained in:
Taylor Brandstetter
2021-11-03 13:45:46 -07:00
committed by WebRTC LUCI CQ
parent b75d01690f
commit d2abeab308
3 changed files with 0 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
p2p/base/stun_port.h
View File

@ -32,22 +32,6 @@ static const int HIGH_COST_PORT_KEEPALIVE_LIFETIME = 2 * 60 * 1000;
// Communicates using the address on the outside of a NAT. // Communicates using the address on the outside of a NAT.
class UDPPort : public Port { class UDPPort : public Port {
public: public:
// TODO(bugs.webrtc.org/12132) remove once downstream tests are fixed.
ABSL_DEPRECATED("Use variant without origin attribute below")
static std::unique_ptr<UDPPort> Create(
rtc::Thread* thread,
rtc::PacketSocketFactory* factory,
rtc::Network* network,
rtc::AsyncPacketSocket* socket,
const std::string& username,
const std::string& password,
const std::string& /*unused, was origin*/,
bool emit_local_for_anyaddress,
absl::optional<int> stun_keepalive_interval) {
return Create(thread, factory, network, socket, username, password,
emit_local_for_anyaddress, stun_keepalive_interval);
}
static std::unique_ptr<UDPPort> Create( static std::unique_ptr<UDPPort> Create(
rtc::Thread* thread, rtc::Thread* thread,
rtc::PacketSocketFactory* factory, rtc::PacketSocketFactory* factory,
@ -68,23 +52,6 @@ class UDPPort : public Port {
return port; return port;
} }
// TODO(bugs.webrtc.org/12132) remove once downstream tests are fixed.
ABSL_DEPRECATED("Use variant without origin attribute below")
static std::unique_ptr<UDPPort> Create(
rtc::Thread* thread,
rtc::PacketSocketFactory* factory,
rtc::Network* network,
uint16_t min_port,
uint16_t max_port,
const std::string& username,
const std::string& password,
const std::string& /*unused, was origin*/,
bool emit_local_for_anyaddress,
absl::optional<int> stun_keepalive_interval) {
return Create(thread, factory, network, min_port, max_port, username,
password, emit_local_for_anyaddress, stun_keepalive_interval);
}
static std::unique_ptr<UDPPort> Create( static std::unique_ptr<UDPPort> Create(
rtc::Thread* thread, rtc::Thread* thread,
rtc::PacketSocketFactory* factory, rtc::PacketSocketFactory* factory,

98
p2p/base/turn_port.h
View File

@ -52,24 +52,6 @@ class TurnPort : public Port {
// packets. // packets.
}; };
// TODO(bugs.webrtc.org/12132) remove once downstream tests are fixed.
ABSL_DEPRECATED("Use variant without origin attribute below")
static std::unique_ptr<TurnPort> Create(
rtc::Thread* thread,
rtc::PacketSocketFactory* factory,
rtc::Network* network,
rtc::AsyncPacketSocket* socket,
const std::string& username, // ice username.
const std::string& password, // ice password.
const ProtocolAddress& server_address,
const RelayCredentials& credentials,
int server_priority,
const std::string& /*unused, was origin*/,
webrtc::TurnCustomizer* customizer) {
return Create(thread, factory, network, socket, username, password,
server_address, credentials, server_priority, customizer);
}
// Create a TURN port using the shared UDP socket, `socket`. // Create a TURN port using the shared UDP socket, `socket`.
static std::unique_ptr<TurnPort> Create( static std::unique_ptr<TurnPort> Create(
rtc::Thread* thread, rtc::Thread* thread,
@ -116,30 +98,6 @@ class TurnPort : public Port {
server_address, credentials, server_priority, customizer); server_address, credentials, server_priority, customizer);
} }
// TODO(bugs.webrtc.org/12132) remove once downstream tests are fixed.
ABSL_DEPRECATED("Use variant without origin attribute below")
static std::unique_ptr<TurnPort> Create(
rtc::Thread* thread,
rtc::PacketSocketFactory* factory,
rtc::Network* network,
uint16_t min_port,
uint16_t max_port,
const std::string& username, // ice username.
const std::string& password, // ice password.
const ProtocolAddress& server_address,
const RelayCredentials& credentials,
int server_priority,
const std::string& /*unused, was origin*/,
const std::vector<std::string>& tls_alpn_protocols,
const std::vector<std::string>& tls_elliptic_curves,
webrtc::TurnCustomizer* customizer,
rtc::SSLCertificateVerifier* tls_cert_verifier = nullptr) {
return Create(thread, factory, network, min_port, max_port, username,
password, server_address, credentials, server_priority,
tls_alpn_protocols, tls_elliptic_curves, customizer,
tls_cert_verifier);
}
// Create a TURN port that will use a new socket, bound to `network` and // Create a TURN port that will use a new socket, bound to `network` and
// using a port in the range between `min_port` and `max_port`. // using a port in the range between `min_port` and `max_port`.
static std::unique_ptr<TurnPort> Create( static std::unique_ptr<TurnPort> Create(
@ -297,30 +255,6 @@ class TurnPort : public Port {
void HandleConnectionDestroyed(Connection* conn) override; void HandleConnectionDestroyed(Connection* conn) override;
protected: protected:
// TODO(bugs.webrtc.org/12132) remove once downstream tests are fixed.
ABSL_DEPRECATED("Use variant without origin attribute below")
TurnPort(rtc::Thread* thread,
rtc::PacketSocketFactory* factory,
rtc::Network* network,
rtc::AsyncPacketSocket* socket,
const std::string& username,
const std::string& password,
const ProtocolAddress& server_address,
const RelayCredentials& credentials,
int server_priority,
const std::string& /*unused, was origin*/,
webrtc::TurnCustomizer* customizer)
: TurnPort(thread,
factory,
network,
socket,
username,
password,
server_address,
credentials,
server_priority,
customizer) {}
TurnPort(rtc::Thread* thread, TurnPort(rtc::Thread* thread,
rtc::PacketSocketFactory* factory, rtc::PacketSocketFactory* factory,
rtc::Network* network, rtc::Network* network,
@ -332,38 +266,6 @@ class TurnPort : public Port {
int server_priority, int server_priority,
webrtc::TurnCustomizer* customizer); webrtc::TurnCustomizer* customizer);
// TODO(bugs.webrtc.org/12132) remove once downstream tests are fixed.
ABSL_DEPRECATED("Use variant without origin attribute below")
TurnPort(rtc::Thread* thread,
rtc::PacketSocketFactory* factory,
rtc::Network* network,
uint16_t min_port,
uint16_t max_port,
const std::string& username,
const std::string& password,
const ProtocolAddress& server_address,
const RelayCredentials& credentials,
int server_priority,
const std::string& /*unused, was origin*/,
const std::vector<std::string>& tls_alpn_protocols,
const std::vector<std::string>& tls_elliptic_curves,
webrtc::TurnCustomizer* customizer,
rtc::SSLCertificateVerifier* tls_cert_verifier = nullptr)
: TurnPort(thread,
factory,
network,
min_port,
max_port,
username,
password,
server_address,
credentials,
server_priority,
tls_alpn_protocols,
tls_elliptic_curves,
customizer,
tls_cert_verifier) {}
TurnPort(rtc::Thread* thread, TurnPort(rtc::Thread* thread,
rtc::PacketSocketFactory* factory, rtc::PacketSocketFactory* factory,
rtc::Network* network, rtc::Network* network,

3
p2p/client/relay_port_factory_interface.h
View File

@ -43,9 +43,6 @@ struct CreateRelayPortArgs {
const RelayServerConfig* config; const RelayServerConfig* config;
std::string username; std::string username;
std::string password; std::string password;
// TODO(bugs.webrtc.org/12132) remove once downstream tests are fixed.
ABSL_DEPRECATED("stun origin support is going away")
std::string origin;
webrtc::TurnCustomizer* turn_customizer; webrtc::TurnCustomizer* turn_customizer;
}; };