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

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

Issue 2351513002: net: rename BoundNetLog to NetLogWithSource (Closed)
Patch Set: one more fix, content bound_net_log_ Created 4 years, 3 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
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_SOCKS5_CLIENT_SOCKET_H_ 5 #ifndef NET_SOCKET_SOCKS5_CLIENT_SOCKET_H_
6 #define NET_SOCKET_SOCKS5_CLIENT_SOCKET_H_ 6 #define NET_SOCKET_SOCKS5_CLIENT_SOCKET_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
11 #include <memory> 11 #include <memory>
12 #include <string> 12 #include <string>
13 13
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
16 #include "net/base/address_list.h" 16 #include "net/base/address_list.h"
17 #include "net/base/completion_callback.h" 17 #include "net/base/completion_callback.h"
18 #include "net/base/net_errors.h" 18 #include "net/base/net_errors.h"
19 #include "net/dns/host_resolver.h" 19 #include "net/dns/host_resolver.h"
20 #include "net/log/net_log.h" 20 #include "net/log/net_log.h"
21 #include "net/socket/stream_socket.h" 21 #include "net/socket/stream_socket.h"
22 #include "url/gurl.h" 22 #include "url/gurl.h"
23 23
24 namespace net { 24 namespace net {
25 25
26 class ClientSocketHandle; 26 class ClientSocketHandle;
27 class BoundNetLog; 27 class NetLogWithSource;
28 28
29 // This StreamSocket is used to setup a SOCKSv5 handshake with a socks proxy. 29 // This StreamSocket is used to setup a SOCKSv5 handshake with a socks proxy.
30 // Currently no SOCKSv5 authentication is supported. 30 // Currently no SOCKSv5 authentication is supported.
31 class NET_EXPORT_PRIVATE SOCKS5ClientSocket : public StreamSocket { 31 class NET_EXPORT_PRIVATE SOCKS5ClientSocket : public StreamSocket {
32 public: 32 public:
33 // |req_info| contains the hostname and port to which the socket above will 33 // |req_info| contains the hostname and port to which the socket above will
34 // communicate to via the SOCKS layer. 34 // communicate to via the SOCKS layer.
35 // 35 //
36 // Although SOCKS 5 supports 3 different modes of addressing, we will 36 // Although SOCKS 5 supports 3 different modes of addressing, we will
37 // always pass it a hostname. This means the DNS resolving is done 37 // always pass it a hostname. This means the DNS resolving is done
38 // proxy side. 38 // proxy side.
39 SOCKS5ClientSocket(std::unique_ptr<ClientSocketHandle> transport_socket, 39 SOCKS5ClientSocket(std::unique_ptr<ClientSocketHandle> transport_socket,
40 const HostResolver::RequestInfo& req_info); 40 const HostResolver::RequestInfo& req_info);
41 41
42 // On destruction Disconnect() is called. 42 // On destruction Disconnect() is called.
43 ~SOCKS5ClientSocket() override; 43 ~SOCKS5ClientSocket() override;
44 44
45 // StreamSocket implementation. 45 // StreamSocket implementation.
46 46
47 // Does the SOCKS handshake and completes the protocol. 47 // Does the SOCKS handshake and completes the protocol.
48 int Connect(const CompletionCallback& callback) override; 48 int Connect(const CompletionCallback& callback) override;
49 void Disconnect() override; 49 void Disconnect() override;
50 bool IsConnected() const override; 50 bool IsConnected() const override;
51 bool IsConnectedAndIdle() const override; 51 bool IsConnectedAndIdle() const override;
52 const BoundNetLog& NetLog() const override; 52 const NetLogWithSource& NetLog() const override;
53 void SetSubresourceSpeculation() override; 53 void SetSubresourceSpeculation() override;
54 void SetOmniboxSpeculation() override; 54 void SetOmniboxSpeculation() override;
55 bool WasEverUsed() const override; 55 bool WasEverUsed() const override;
56 bool WasNpnNegotiated() const override; 56 bool WasNpnNegotiated() const override;
57 NextProto GetNegotiatedProtocol() const override; 57 NextProto GetNegotiatedProtocol() const override;
58 bool GetSSLInfo(SSLInfo* ssl_info) override; 58 bool GetSSLInfo(SSLInfo* ssl_info) override;
59 void GetConnectionAttempts(ConnectionAttempts* out) const override; 59 void GetConnectionAttempts(ConnectionAttempts* out) const override;
60 void ClearConnectionAttempts() override {} 60 void ClearConnectionAttempts() override {}
61 void AddConnectionAttempts(const ConnectionAttempts& attempts) override {} 61 void AddConnectionAttempts(const ConnectionAttempts& attempts) override {}
62 int64_t GetTotalReceivedBytes() const override; 62 int64_t GetTotalReceivedBytes() const override;
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 // These contain the bytes sent / received by the SOCKS handshake. 146 // These contain the bytes sent / received by the SOCKS handshake.
147 size_t bytes_sent_; 147 size_t bytes_sent_;
148 size_t bytes_received_; 148 size_t bytes_received_;
149 149
150 size_t read_header_size; 150 size_t read_header_size;
151 151
152 bool was_ever_used_; 152 bool was_ever_used_;
153 153
154 HostResolver::RequestInfo host_request_info_; 154 HostResolver::RequestInfo host_request_info_;
155 155
156 BoundNetLog net_log_; 156 NetLogWithSource net_log_;
157 157
158 DISALLOW_COPY_AND_ASSIGN(SOCKS5ClientSocket); 158 DISALLOW_COPY_AND_ASSIGN(SOCKS5ClientSocket);
159 }; 159 };
160 160
161 } // namespace net 161 } // namespace net
162 162
163 #endif // NET_SOCKET_SOCKS5_CLIENT_SOCKET_H_ 163 #endif // NET_SOCKET_SOCKS5_CLIENT_SOCKET_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698