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

Fix the build break by keeping the old Port::AddAddress method since the

Browse Source 
downstream application depends on it.
Mark the old Port::AddAddress deprecated and will be removed after the
applications stop replying on it.

BUG=None.
R=deadbeef@webrtc.org

Review-Url: https://codereview.webrtc.org/2694103003 .
Cr-Commit-Position: refs/heads/master@{#16598}
This commit is contained in:
Peter Boström
2017-02-13 20:33:27 -05:00
parent c874d1296a
commit 2758c664b4
2 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
webrtc/p2p/base/port.cc
View File

@ -243,6 +243,20 @@ Connection* Port::GetConnection(const rtc::SocketAddress& remote_addr) {
return NULL;
}
void Port::AddAddress(const rtc::SocketAddress& address,
const rtc::SocketAddress& base_address,
const rtc::SocketAddress& related_address,
const std::string& protocol,
const std::string& relay_protocol,
const std::string& tcptype,
const std::string& type,
uint32_t type_preference,
uint32_t relay_preference,
bool final) {
AddAddress(address, base_address, related_address, protocol, relay_protocol,
tcptype, type, type_preference, relay_preference, "", final);
}
void Port::AddAddress(const rtc::SocketAddress& address,
const rtc::SocketAddress& base_address,
const rtc::SocketAddress& related_address,

13
webrtc/p2p/base/port.h
View File

@ -323,6 +323,19 @@ class Port : public PortInterface, public rtc::MessageHandler,
void set_type(const std::string& type) { type_ = type; }
// Deprecated. Use the AddAddress() method below with "url" instead.
// TODO(zhihuang): Remove this after downstream applications stop using it.
void AddAddress(const rtc::SocketAddress& address,
const rtc::SocketAddress& base_address,
const rtc::SocketAddress& related_address,
const std::string& protocol,
const std::string& relay_protocol,
const std::string& tcptype,
const std::string& type,
uint32_t type_preference,
uint32_t relay_preference,
bool final);
void AddAddress(const rtc::SocketAddress& address,
const rtc::SocketAddress& base_address,
const rtc::SocketAddress& related_address,