From 90d67ddc1df6dc5377d7a84611d4e102b42c4933 Mon Sep 17 00:00:00 2001 From: tfarina Date: Fri, 23 Oct 2015 11:22:01 -0700 Subject: [PATCH] Remove two more deprecated methods from SocketAddress API. This patch removes IPToString and IPToSensitiveString static helper methods, since there are class methods that replace them already, and they aren't used by anyone anymore. BUG=None R=pthacher@webrtc.org Review URL: https://codereview.webrtc.org/1408873005 Cr-Commit-Position: refs/heads/master@{#10391} --- webrtc/base/socketaddress.cc | 8 -------- webrtc/base/socketaddress.h | 9 --------- 2 files changed, 17 deletions(-) diff --git a/webrtc/base/socketaddress.cc b/webrtc/base/socketaddress.cc index 3f13c385a9..79ede80181 100644 --- a/webrtc/base/socketaddress.cc +++ b/webrtc/base/socketaddress.cc @@ -307,14 +307,6 @@ size_t SocketAddress::ToSockAddrStorage(sockaddr_storage* addr) const { return ToSockAddrStorageHelper(addr, ip_, port_, scope_id_); } -std::string SocketAddress::IPToString(uint32_t ip_as_host_order_integer) { - return IPAddress(ip_as_host_order_integer).ToString(); -} - -std::string IPToSensitiveString(uint32_t ip_as_host_order_integer) { - return IPAddress(ip_as_host_order_integer).ToSensitiveString(); -} - bool SocketAddress::StringToIP(const std::string& hostname, uint32_t* ip) { in_addr addr; if (rtc::inet_pton(AF_INET, hostname.c_str(), &addr) == 0) diff --git a/webrtc/base/socketaddress.h b/webrtc/base/socketaddress.h index 1574ef916e..1d975a1c0e 100644 --- a/webrtc/base/socketaddress.h +++ b/webrtc/base/socketaddress.h @@ -177,15 +177,6 @@ class SocketAddress { size_t ToDualStackSockAddrStorage(sockaddr_storage* saddr) const; size_t ToSockAddrStorage(sockaddr_storage* saddr) const; - // Converts the IP address given in 'compact form' into dotted form. - // IP is given as an integer in host byte order. V4 only, to be deprecated. - // TODO: Deprecate this. - static std::string IPToString(uint32_t ip_as_host_order_integer); - - // Same as IPToString but anonymizes it by hiding the last part. - // TODO: Deprecate this. - static std::string IPToSensitiveString(uint32_t ip_as_host_order_integer); - // Converts the IP address given in dotted form into compact form. // Only dotted names (A.B.C.D) are converted. // Output integer is returned in host byte order.