From 20a34619080005c3b0e49d85b307113ea2b180c3 Mon Sep 17 00:00:00 2001 From: tfarina Date: Mon, 2 Nov 2015 16:20:22 -0800 Subject: [PATCH] Remove deprecated IsUnresolved() method from SocketAddress API. This patch removes IsUnresolved() method and update the clients to use IsUnresolvedIP() instead. BUG=None R=perkj@webrtc.org TBR=glaznev@webrtc.org Review URL: https://codereview.webrtc.org/1414793006 Cr-Commit-Position: refs/heads/master@{#10487} --- webrtc/base/macasyncsocket.cc | 2 +- webrtc/base/physicalsocketserver.cc | 2 +- webrtc/base/proxydetect.cc | 2 +- webrtc/base/socketadapters.cc | 2 +- webrtc/base/socketaddress.h | 1 - .../client/peer_connection_client.cc | 2 +- webrtc/p2p/base/stunport.cc | 16 ++++++++-------- webrtc/p2p/base/turnport.cc | 4 ++-- 8 files changed, 15 insertions(+), 16 deletions(-) diff --git a/webrtc/base/macasyncsocket.cc b/webrtc/base/macasyncsocket.cc index 1f12500b73..8f811ea8b6 100644 --- a/webrtc/base/macasyncsocket.cc +++ b/webrtc/base/macasyncsocket.cc @@ -112,7 +112,7 @@ int MacAsyncSocket::Connect(const SocketAddress& addr) { SetError(EALREADY); return SOCKET_ERROR; } - if (addr.IsUnresolved()) { + if (addr.IsUnresolvedIP()) { LOG(LS_VERBOSE) << "Resolving addr in MacAsyncSocket::Connect"; resolver_ = new AsyncResolver(); resolver_->SignalWorkDone.connect(this, diff --git a/webrtc/base/physicalsocketserver.cc b/webrtc/base/physicalsocketserver.cc index c3abb24d46..e0fe8a06e3 100644 --- a/webrtc/base/physicalsocketserver.cc +++ b/webrtc/base/physicalsocketserver.cc @@ -187,7 +187,7 @@ class PhysicalSocket : public AsyncSocket, public sigslot::has_slots<> { SetError(EALREADY); return SOCKET_ERROR; } - if (addr.IsUnresolved()) { + if (addr.IsUnresolvedIP()) { LOG(LS_VERBOSE) << "Resolving addr in PhysicalSocket::Connect"; resolver_ = new AsyncResolver(); resolver_->SignalDone.connect(this, &PhysicalSocket::OnResolveResult); diff --git a/webrtc/base/proxydetect.cc b/webrtc/base/proxydetect.cc index b144d20a97..c0cfab9b0e 100644 --- a/webrtc/base/proxydetect.cc +++ b/webrtc/base/proxydetect.cc @@ -222,7 +222,7 @@ bool ProxyItemMatch(const Url& url, char * item, size_t len) { uint32_t mask = (m == 0) ? 0 : (~0UL) << (32 - m); SocketAddress addr(url.host(), 0); // TODO: Support IPv6 proxyitems. This code block is IPv4 only anyway. - return !addr.IsUnresolved() && + return !addr.IsUnresolvedIP() && ((addr.ipaddr().v4AddressAsHostOrderInteger() & mask) == (ip & mask)); } diff --git a/webrtc/base/socketadapters.cc b/webrtc/base/socketadapters.cc index af2efb82c7..2b513dca63 100644 --- a/webrtc/base/socketadapters.cc +++ b/webrtc/base/socketadapters.cc @@ -688,7 +688,7 @@ void AsyncSocksProxySocket::SendConnect() { request.WriteUInt8(5); // Socks Version request.WriteUInt8(1); // CONNECT request.WriteUInt8(0); // Reserved - if (dest_.IsUnresolved()) { + if (dest_.IsUnresolvedIP()) { std::string hostname = dest_.hostname(); request.WriteUInt8(3); // DOMAINNAME request.WriteUInt8(static_cast(hostname.size())); diff --git a/webrtc/base/socketaddress.h b/webrtc/base/socketaddress.h index 1d975a1c0e..6d4dda06fc 100644 --- a/webrtc/base/socketaddress.h +++ b/webrtc/base/socketaddress.h @@ -141,7 +141,6 @@ class SocketAddress { // Determines whether the hostname has been resolved to an IP. bool IsUnresolvedIP() const; - inline bool IsUnresolved() const { return IsUnresolvedIP(); } // deprecated // Determines whether this address is identical to the given one. bool operator ==(const SocketAddress& addr) const; diff --git a/webrtc/examples/peerconnection/client/peer_connection_client.cc b/webrtc/examples/peerconnection/client/peer_connection_client.cc index d49ce35060..ab6f6abdf6 100644 --- a/webrtc/examples/peerconnection/client/peer_connection_client.cc +++ b/webrtc/examples/peerconnection/client/peer_connection_client.cc @@ -114,7 +114,7 @@ void PeerConnectionClient::Connect(const std::string& server, int port, server_address_.SetPort(port); client_name_ = client_name; - if (server_address_.IsUnresolved()) { + if (server_address_.IsUnresolvedIP()) { state_ = RESOLVING; resolver_ = new rtc::AsyncResolver(); resolver_->SignalDone.connect(this, &PeerConnectionClient::OnResolveResult); diff --git a/webrtc/p2p/base/stunport.cc b/webrtc/p2p/base/stunport.cc index c0a8975152..86eaf65a21 100644 --- a/webrtc/p2p/base/stunport.cc +++ b/webrtc/p2p/base/stunport.cc @@ -310,12 +310,13 @@ void UDPPort::OnLocalAddressReady(rtc::AsyncPacketSocket* socket, MaybePrepareStunCandidate(); } -void UDPPort::OnReadPacket( - rtc::AsyncPacketSocket* socket, const char* data, size_t size, - const rtc::SocketAddress& remote_addr, - const rtc::PacketTime& packet_time) { +void UDPPort::OnReadPacket(rtc::AsyncPacketSocket* socket, + const char* data, + size_t size, + const rtc::SocketAddress& remote_addr, + const rtc::PacketTime& packet_time) { ASSERT(socket == socket_); - ASSERT(!remote_addr.IsUnresolved()); + ASSERT(!remote_addr.IsUnresolvedIP()); // Look for a response from the STUN server. // Even if the response doesn't match one of our outstanding requests, we @@ -383,9 +384,8 @@ void UDPPort::OnResolveResult(const rtc::SocketAddress& input, } } -void UDPPort::SendStunBindingRequest( - const rtc::SocketAddress& stun_addr) { - if (stun_addr.IsUnresolved()) { +void UDPPort::SendStunBindingRequest(const rtc::SocketAddress& stun_addr) { + if (stun_addr.IsUnresolvedIP()) { ResolveStunAddress(stun_addr); } else if (socket_->GetState() == rtc::AsyncPacketSocket::STATE_BOUND) { diff --git a/webrtc/p2p/base/turnport.cc b/webrtc/p2p/base/turnport.cc index 3fdcac5f31..1cc885e27d 100644 --- a/webrtc/p2p/base/turnport.cc +++ b/webrtc/p2p/base/turnport.cc @@ -267,7 +267,7 @@ void TurnPort::PrepareAddress() { server_address_.address.SetPort(TURN_DEFAULT_PORT); } - if (server_address_.address.IsUnresolved()) { + if (server_address_.address.IsUnresolvedIP()) { ResolveTurnAddress(server_address_.address); } else { // If protocol family of server address doesn't match with local, return. @@ -380,7 +380,7 @@ void TurnPort::OnSocketConnect(rtc::AsyncPacketSocket* socket) { } state_ = STATE_CONNECTED; // It is ready to send stun requests. - if (server_address_.address.IsUnresolved()) { + if (server_address_.address.IsUnresolvedIP()) { server_address_.address = socket_->GetRemoteAddress(); }