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

Side by Side Diff: net/ftp/ftp_network_transaction.h

Issue 1535363003: Switch to standard integer types in net/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: stddef Created 5 years 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
« no previous file with comments | « net/ftp/ftp_network_layer.h ('k') | net/ftp/ftp_network_transaction.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_FTP_FTP_NETWORK_TRANSACTION_H_ 5 #ifndef NET_FTP_FTP_NETWORK_TRANSACTION_H_
6 #define NET_FTP_FTP_NETWORK_TRANSACTION_H_ 6 #define NET_FTP_FTP_NETWORK_TRANSACTION_H_
7 7
8 #include <stdint.h>
9
8 #include <string> 10 #include <string>
9 #include <utility> 11 #include <utility>
10 12
11 #include "base/basictypes.h"
12 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
13 #include "base/gtest_prod_util.h" 14 #include "base/gtest_prod_util.h"
14 #include "base/memory/ref_counted.h" 15 #include "base/memory/ref_counted.h"
15 #include "base/memory/scoped_ptr.h" 16 #include "base/memory/scoped_ptr.h"
16 #include "net/base/address_list.h" 17 #include "net/base/address_list.h"
17 #include "net/base/auth.h" 18 #include "net/base/auth.h"
18 #include "net/dns/host_resolver.h" 19 #include "net/dns/host_resolver.h"
19 #include "net/dns/single_request_host_resolver.h" 20 #include "net/dns/single_request_host_resolver.h"
20 #include "net/ftp/ftp_ctrl_response_buffer.h" 21 #include "net/ftp/ftp_ctrl_response_buffer.h"
21 #include "net/ftp/ftp_response_info.h" 22 #include "net/ftp/ftp_response_info.h"
(...skipping 17 matching lines...) Expand all
39 int Start(const FtpRequestInfo* request_info, 40 int Start(const FtpRequestInfo* request_info,
40 const CompletionCallback& callback, 41 const CompletionCallback& callback,
41 const BoundNetLog& net_log) override; 42 const BoundNetLog& net_log) override;
42 int RestartWithAuth(const AuthCredentials& credentials, 43 int RestartWithAuth(const AuthCredentials& credentials,
43 const CompletionCallback& callback) override; 44 const CompletionCallback& callback) override;
44 int Read(IOBuffer* buf, 45 int Read(IOBuffer* buf,
45 int buf_len, 46 int buf_len,
46 const CompletionCallback& callback) override; 47 const CompletionCallback& callback) override;
47 const FtpResponseInfo* GetResponseInfo() const override; 48 const FtpResponseInfo* GetResponseInfo() const override;
48 LoadState GetLoadState() const override; 49 LoadState GetLoadState() const override;
49 uint64 GetUploadProgress() const override; 50 uint64_t GetUploadProgress() const override;
50 51
51 private: 52 private:
52 FRIEND_TEST_ALL_PREFIXES(FtpNetworkTransactionTest, 53 FRIEND_TEST_ALL_PREFIXES(FtpNetworkTransactionTest,
53 DownloadTransactionEvilPasvUnsafeHost); 54 DownloadTransactionEvilPasvUnsafeHost);
54 55
55 enum Command { 56 enum Command {
56 COMMAND_NONE, 57 COMMAND_NONE,
57 COMMAND_USER, 58 COMMAND_USER,
58 COMMAND_PASS, 59 COMMAND_PASS,
59 COMMAND_SYST, 60 COMMAND_SYST,
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 // Initially we favour EPSV over PASV for transfers but should any 238 // Initially we favour EPSV over PASV for transfers but should any
238 // EPSV fail, we fall back to PASV for the duration of connection. 239 // EPSV fail, we fall back to PASV for the duration of connection.
239 bool use_epsv_; 240 bool use_epsv_;
240 241
241 AuthCredentials credentials_; 242 AuthCredentials credentials_;
242 243
243 // Current directory on the remote server, as returned by last PWD command, 244 // Current directory on the remote server, as returned by last PWD command,
244 // with any trailing slash removed. 245 // with any trailing slash removed.
245 std::string current_remote_directory_; 246 std::string current_remote_directory_;
246 247
247 uint16 data_connection_port_; 248 uint16_t data_connection_port_;
248 249
249 ClientSocketFactory* socket_factory_; 250 ClientSocketFactory* socket_factory_;
250 251
251 scoped_ptr<StreamSocket> ctrl_socket_; 252 scoped_ptr<StreamSocket> ctrl_socket_;
252 scoped_ptr<StreamSocket> data_socket_; 253 scoped_ptr<StreamSocket> data_socket_;
253 254
254 State next_state_; 255 State next_state_;
255 256
256 // State to switch to after data connection is complete. 257 // State to switch to after data connection is complete.
257 State state_after_data_connect_complete_; 258 State state_after_data_connect_complete_;
258 }; 259 };
259 260
260 } // namespace net 261 } // namespace net
261 262
262 #endif // NET_FTP_FTP_NETWORK_TRANSACTION_H_ 263 #endif // NET_FTP_FTP_NETWORK_TRANSACTION_H_
OLDNEW
« no previous file with comments | « net/ftp/ftp_network_layer.h ('k') | net/ftp/ftp_network_transaction.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698