fixed issue 128383 - replace GetPeerAddress(AddressList* address) with GetPeerAddress(IPEndPoint* a…

net/socket/ssl_client_socket_nss.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file includes code SSLClientSocketNSS::DoVerifyCertComplete() derived
 // from AuthCertificateCallback() in
 // mozilla/security/manager/ssl/src/nsNSSCallbacks.cpp.
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ skipping 667 matching lines @@
   // the close_notify alert message means EOF in the SSL layer, it is just
   // bytes to the transport layer below, so
   // transport_->socket()->IsConnectedAndIdle() returns the desired false
   // when we receive close_notify.
   EnterFunction("");
   bool ret = completed_handshake_ && transport_->socket()->IsConnectedAndIdle();
   LeaveFunction("");
   return ret;
 }
 
-int SSLClientSocketNSS::GetPeerAddress(AddressList* address) const {
+int SSLClientSocketNSS::GetPeerAddress(IPEndPoint* address) const {
   return transport_->socket()->GetPeerAddress(address);
 }
 
 int SSLClientSocketNSS::GetLocalAddress(IPEndPoint* address) const {
   return transport_->socket()->GetLocalAddress(address);
 }
 
 const BoundNetLog& SSLClientSocketNSS::NetLog() const {
   return net_log_;
 }
@@ skipping 305 matching lines @@
   SSL_SetURL(nss_fd_, host_and_port_.host().c_str());
 
   // Tell SSL we're a client; needed if not letting NSPR do socket I/O
   SSL_ResetHandshake(nss_fd_, PR_FALSE);
 
   return OK;
 }
 
 int SSLClientSocketNSS::InitializeSSLPeerName() {
   // Tell NSS who we're connected to
-  AddressList peer_address;
+  IPEndPoint peer_address;
   int err = transport_->socket()->GetPeerAddress(&peer_address);
   if (err != OK)
     return err;
 
   SockaddrStorage storage;
-  if (!peer_address.front().ToSockAddr(storage.addr, &storage.addr_len))
+  if (!peer_address.ToSockAddr(storage.addr, &storage.addr_len))
     return ERR_UNEXPECTED;
 
   PRNetAddr peername;
   memset(&peername, 0, sizeof(peername));
   DCHECK_LE(static_cast<size_t>(storage.addr_len), sizeof(peername));
   size_t len = std::min(static_cast<size_t>(storage.addr_len),
                         sizeof(peername));
   memcpy(&peername, storage.addr, len);
 
   // Adjust the address family field for BSD, whose sockaddr
@@ skipping 1608 matching lines @@
   EnsureThreadIdAssigned();
   base::AutoLock auto_lock(lock_);
   return valid_thread_id_ == base::PlatformThread::CurrentId();
 }
 
 ServerBoundCertService* SSLClientSocketNSS::GetServerBoundCertService() const {
   return server_bound_cert_service_;
 }
 
 }  // namespace net