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}
This commit is contained in:
parent
22ae293949
commit
20a3461908
@ -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,
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -222,7 +222,7 @@ bool ProxyItemMatch(const Url<char>& 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));
|
||||
}
|
||||
|
||||
|
||||
@ -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<uint8_t>(hostname.size()));
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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);
|
||||
|
||||
@ -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) {
|
||||
|
||||
@ -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();
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user