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

Side by Side Diff: net/socket/socks_client_socket.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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/socket/socks_client_socket.h ('k') | net/socket/ssl_client_socket_mac.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 #include "net/socket/socks_client_socket.h" 5 #include "net/socket/socks_client_socket.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/sys_byteorder.h" 10 #include "base/sys_byteorder.h"
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 << "not confirm the user ID string in the request"; 424 << "not confirm the user ID string in the request";
425 return ERR_SOCKS_CONNECTION_FAILED; 425 return ERR_SOCKS_CONNECTION_FAILED;
426 default: 426 default:
427 LOG(ERROR) << "SOCKS server sent unknown response"; 427 LOG(ERROR) << "SOCKS server sent unknown response";
428 return ERR_SOCKS_CONNECTION_FAILED; 428 return ERR_SOCKS_CONNECTION_FAILED;
429 } 429 }
430 430
431 // Note: we ignore the last 6 bytes as specified by the SOCKS protocol 431 // Note: we ignore the last 6 bytes as specified by the SOCKS protocol
432 } 432 }
433 433
434 int SOCKSClientSocket::GetPeerAddress(AddressList* address) const { 434 int SOCKSClientSocket::GetPeerAddress(IPEndPoint* address) const {
435 return transport_->socket()->GetPeerAddress(address); 435 return transport_->socket()->GetPeerAddress(address);
436 } 436 }
437 437
438 int SOCKSClientSocket::GetLocalAddress(IPEndPoint* address) const { 438 int SOCKSClientSocket::GetLocalAddress(IPEndPoint* address) const {
439 return transport_->socket()->GetLocalAddress(address); 439 return transport_->socket()->GetLocalAddress(address);
440 } 440 }
441 441
442 } // namespace net 442 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/socks_client_socket.h ('k') | net/socket/ssl_client_socket_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698