Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(753)

Unified Diff: net/socket/ssl_client_socket_mac.cc

Issue 10491007: fixed issue 128383 - replace GetPeerAddress(AddressList* address) with GetPeerAddress(IPEndPoint* a… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix according to review Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/socket/ssl_client_socket_mac.h ('k') | net/socket/ssl_client_socket_nss.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_mac.cc
diff --git a/net/socket/ssl_client_socket_mac.cc b/net/socket/ssl_client_socket_mac.cc
index 862ef523a9ef34f0aff5968c36f20718a8d657d3..fb697267d47d6fb5e66b82482bdd1c2b778a578f 100644
--- a/net/socket/ssl_client_socket_mac.cc
+++ b/net/socket/ssl_client_socket_mac.cc
@@ -609,7 +609,7 @@ bool SSLClientSocketMac::IsConnectedAndIdle() const {
return completed_handshake() && transport_->socket()->IsConnectedAndIdle();
}
-int SSLClientSocketMac::GetPeerAddress(AddressList* address) const {
+int SSLClientSocketMac::GetPeerAddress(IPEndPoint* address) const {
return transport_->socket()->GetPeerAddress(address);
}
@@ -884,11 +884,10 @@ int SSLClientSocketMac::InitializeSSLContext() {
// using the same hostname (i.e., localhost and 127.0.0.1 are considered
// different peers, which puts us through certificate validation again
// and catches hostname/certificate name mismatches.
- AddressList address;
- int rv = transport_->socket()->GetPeerAddress(&address);
+ IPEndPoint endpoint;
+ int rv = transport_->socket()->GetPeerAddress(&endpoint);
if (rv != OK)
return rv;
- const IPEndPoint& endpoint = address.front();
std::string peer_id(host_and_port_.ToString());
peer_id += std::string(reinterpret_cast<const char*>(&endpoint.address()[0]),
endpoint.address().size());
« no previous file with comments | « net/socket/ssl_client_socket_mac.h ('k') | net/socket/ssl_client_socket_nss.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698