Chromium Code Reviews

Side by Side Diff: net/socket/ssl_client_socket_openssl.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.
Jump to:
View unified diff | | Annotate | Revision Log
« no previous file with comments | « net/socket/ssl_client_socket_openssl.h ('k') | net/socket/ssl_client_socket_win.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // OpenSSL binding for SSLClientSocket. The class layout and general principle 5 // OpenSSL binding for SSLClientSocket. The class layout and general principle
6 // of operation is derived from SSLClientSocketNSS. 6 // of operation is derived from SSLClientSocketNSS.
7 7
8 #include "net/socket/ssl_client_socket_openssl.h" 8 #include "net/socket/ssl_client_socket_openssl.h"
9 9
10 #include <openssl/ssl.h> 10 #include <openssl/ssl.h>
(...skipping 1137 matching lines...)
1148 bool SSLClientSocketOpenSSL::IsConnected() const { 1148 bool SSLClientSocketOpenSSL::IsConnected() const {
1149 bool ret = completed_handshake_ && transport_->socket()->IsConnected(); 1149 bool ret = completed_handshake_ && transport_->socket()->IsConnected();
1150 return ret; 1150 return ret;
1151 } 1151 }
1152 1152
1153 bool SSLClientSocketOpenSSL::IsConnectedAndIdle() const { 1153 bool SSLClientSocketOpenSSL::IsConnectedAndIdle() const {
1154 bool ret = completed_handshake_ && transport_->socket()->IsConnectedAndIdle(); 1154 bool ret = completed_handshake_ && transport_->socket()->IsConnectedAndIdle();
1155 return ret; 1155 return ret;
1156 } 1156 }
1157 1157
1158 int SSLClientSocketOpenSSL::GetPeerAddress(AddressList* addressList) const { 1158 int SSLClientSocketOpenSSL::GetPeerAddress(IPEndPoint* addressList) const {
1159 return transport_->socket()->GetPeerAddress(addressList); 1159 return transport_->socket()->GetPeerAddress(addressList);
1160 } 1160 }
1161 1161
1162 int SSLClientSocketOpenSSL::GetLocalAddress(IPEndPoint* addressList) const { 1162 int SSLClientSocketOpenSSL::GetLocalAddress(IPEndPoint* addressList) const {
1163 return transport_->socket()->GetLocalAddress(addressList); 1163 return transport_->socket()->GetLocalAddress(addressList);
1164 } 1164 }
1165 1165
1166 const BoundNetLog& SSLClientSocketOpenSSL::NetLog() const { 1166 const BoundNetLog& SSLClientSocketOpenSSL::NetLog() const {
1167 return net_log_; 1167 return net_log_;
1168 } 1168 }
(...skipping 146 matching lines...)
1315 net_log_.AddByteTransferEvent(NetLog::TYPE_SSL_SOCKET_BYTES_SENT, rv, 1315 net_log_.AddByteTransferEvent(NetLog::TYPE_SSL_SOCKET_BYTES_SENT, rv,
1316 user_write_buf_->data()); 1316 user_write_buf_->data());
1317 return rv; 1317 return rv;
1318 } 1318 }
1319 1319
1320 int err = SSL_get_error(ssl_, rv); 1320 int err = SSL_get_error(ssl_, rv);
1321 return MapOpenSSLError(err, err_tracer); 1321 return MapOpenSSLError(err, err_tracer);
1322 } 1322 }
1323 1323
1324 } // namespace net 1324 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/ssl_client_socket_openssl.h ('k') | net/socket/ssl_client_socket_win.h » ('j') | no next file with comments »

Powered by Google App Engine