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

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

Issue 718273002: Use uint16 for port numbers, net/ edition (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comment Created 6 years, 1 month 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_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 <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 // Initially we favour EPSV over PASV for transfers but should any 238 // Initially we favour EPSV over PASV for transfers but should any
239 // 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.
240 bool use_epsv_; 240 bool use_epsv_;
241 241
242 AuthCredentials credentials_; 242 AuthCredentials credentials_;
243 243
244 // 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,
245 // with any trailing slash removed. 245 // with any trailing slash removed.
246 std::string current_remote_directory_; 246 std::string current_remote_directory_;
247 247
248 int data_connection_port_; 248 uint16 data_connection_port_;
mmenke 2014/11/18 21:06:39 include basictypes.h
Peter Kasting 2014/11/18 23:38:42 Done.
249 249
250 ClientSocketFactory* socket_factory_; 250 ClientSocketFactory* socket_factory_;
251 251
252 scoped_ptr<StreamSocket> ctrl_socket_; 252 scoped_ptr<StreamSocket> ctrl_socket_;
253 scoped_ptr<StreamSocket> data_socket_; 253 scoped_ptr<StreamSocket> data_socket_;
254 254
255 State next_state_; 255 State next_state_;
256 256
257 // State to switch to after data connection is complete. 257 // State to switch to after data connection is complete.
258 State state_after_data_connect_complete_; 258 State state_after_data_connect_complete_;
259 }; 259 };
260 260
261 } // namespace net 261 } // namespace net
262 262
263 #endif // NET_FTP_FTP_NETWORK_TRANSACTION_H_ 263 #endif // NET_FTP_FTP_NETWORK_TRANSACTION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698