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

Side by Side Diff: net/socket/socks_client_socket.h

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/socks5_client_socket.cc ('k') | net/socket/socks_client_socket.cc » ('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 #ifndef NET_SOCKET_SOCKS_CLIENT_SOCKET_H_ 5 #ifndef NET_SOCKET_SOCKS_CLIENT_SOCKET_H_
6 #define NET_SOCKET_SOCKS_CLIENT_SOCKET_H_ 6 #define NET_SOCKET_SOCKS_CLIENT_SOCKET_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 virtual int Read(IOBuffer* buf, 65 virtual int Read(IOBuffer* buf,
66 int buf_len, 66 int buf_len,
67 const CompletionCallback& callback) OVERRIDE; 67 const CompletionCallback& callback) OVERRIDE;
68 virtual int Write(IOBuffer* buf, 68 virtual int Write(IOBuffer* buf,
69 int buf_len, 69 int buf_len,
70 const CompletionCallback& callback) OVERRIDE; 70 const CompletionCallback& callback) OVERRIDE;
71 71
72 virtual bool SetReceiveBufferSize(int32 size) OVERRIDE; 72 virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
73 virtual bool SetSendBufferSize(int32 size) OVERRIDE; 73 virtual bool SetSendBufferSize(int32 size) OVERRIDE;
74 74
75 virtual int GetPeerAddress(AddressList* address) const OVERRIDE; 75 virtual int GetPeerAddress(IPEndPoint* address) const OVERRIDE;
76 virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE; 76 virtual int GetLocalAddress(IPEndPoint* address) const OVERRIDE;
77 77
78 private: 78 private:
79 FRIEND_TEST_ALL_PREFIXES(SOCKSClientSocketTest, CompleteHandshake); 79 FRIEND_TEST_ALL_PREFIXES(SOCKSClientSocketTest, CompleteHandshake);
80 FRIEND_TEST_ALL_PREFIXES(SOCKSClientSocketTest, SOCKS4AFailedDNS); 80 FRIEND_TEST_ALL_PREFIXES(SOCKSClientSocketTest, SOCKS4AFailedDNS);
81 FRIEND_TEST_ALL_PREFIXES(SOCKSClientSocketTest, SOCKS4AIfDomainInIPv6); 81 FRIEND_TEST_ALL_PREFIXES(SOCKSClientSocketTest, SOCKS4AIfDomainInIPv6);
82 82
83 enum State { 83 enum State {
84 STATE_RESOLVE_HOST, 84 STATE_RESOLVE_HOST,
85 STATE_RESOLVE_HOST_COMPLETE, 85 STATE_RESOLVE_HOST_COMPLETE,
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 HostResolver::RequestInfo host_request_info_; 134 HostResolver::RequestInfo host_request_info_;
135 135
136 BoundNetLog net_log_; 136 BoundNetLog net_log_;
137 137
138 DISALLOW_COPY_AND_ASSIGN(SOCKSClientSocket); 138 DISALLOW_COPY_AND_ASSIGN(SOCKSClientSocket);
139 }; 139 };
140 140
141 } // namespace net 141 } // namespace net
142 142
143 #endif // NET_SOCKET_SOCKS_CLIENT_SOCKET_H_ 143 #endif // NET_SOCKET_SOCKS_CLIENT_SOCKET_H_
OLDNEW
« no previous file with comments | « net/socket/socks5_client_socket.cc ('k') | net/socket/socks_client_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698