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

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

Issue 826973002: replace COMPILE_ASSERT with static_assert in net/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: apply fixups Created 5 years, 11 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
« no previous file with comments | « net/socket/client_socket_pool_manager_impl.h ('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 #include "net/socket/socks5_client_socket.h" 5 #include "net/socket/socks5_client_socket.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
11 #include "base/format_macros.h" 11 #include "base/format_macros.h"
12 #include "base/strings/string_util.h" 12 #include "base/strings/string_util.h"
13 #include "base/sys_byteorder.h" 13 #include "base/sys_byteorder.h"
14 #include "net/base/io_buffer.h" 14 #include "net/base/io_buffer.h"
15 #include "net/base/net_log.h" 15 #include "net/base/net_log.h"
16 #include "net/base/net_util.h" 16 #include "net/base/net_util.h"
17 #include "net/socket/client_socket_handle.h" 17 #include "net/socket/client_socket_handle.h"
18 18
19 namespace net { 19 namespace net {
20 20
21 const unsigned int SOCKS5ClientSocket::kGreetReadHeaderSize = 2; 21 const unsigned int SOCKS5ClientSocket::kGreetReadHeaderSize = 2;
22 const unsigned int SOCKS5ClientSocket::kWriteHeaderSize = 10; 22 const unsigned int SOCKS5ClientSocket::kWriteHeaderSize = 10;
23 const unsigned int SOCKS5ClientSocket::kReadHeaderSize = 5; 23 const unsigned int SOCKS5ClientSocket::kReadHeaderSize = 5;
24 const uint8 SOCKS5ClientSocket::kSOCKS5Version = 0x05; 24 const uint8 SOCKS5ClientSocket::kSOCKS5Version = 0x05;
25 const uint8 SOCKS5ClientSocket::kTunnelCommand = 0x01; 25 const uint8 SOCKS5ClientSocket::kTunnelCommand = 0x01;
26 const uint8 SOCKS5ClientSocket::kNullByte = 0x00; 26 const uint8 SOCKS5ClientSocket::kNullByte = 0x00;
27 27
28 COMPILE_ASSERT(sizeof(struct in_addr) == 4, incorrect_system_size_of_IPv4); 28 static_assert(sizeof(struct in_addr) == 4, "incorrect system size of IPv4");
29 COMPILE_ASSERT(sizeof(struct in6_addr) == 16, incorrect_system_size_of_IPv6); 29 static_assert(sizeof(struct in6_addr) == 16, "incorrect system size of IPv6");
30 30
31 SOCKS5ClientSocket::SOCKS5ClientSocket( 31 SOCKS5ClientSocket::SOCKS5ClientSocket(
32 scoped_ptr<ClientSocketHandle> transport_socket, 32 scoped_ptr<ClientSocketHandle> transport_socket,
33 const HostResolver::RequestInfo& req_info) 33 const HostResolver::RequestInfo& req_info)
34 : io_callback_(base::Bind(&SOCKS5ClientSocket::OnIOComplete, 34 : io_callback_(base::Bind(&SOCKS5ClientSocket::OnIOComplete,
35 base::Unretained(this))), 35 base::Unretained(this))),
36 transport_(transport_socket.Pass()), 36 transport_(transport_socket.Pass()),
37 next_state_(STATE_NONE), 37 next_state_(STATE_NONE),
38 completed_handshake_(false), 38 completed_handshake_(false),
39 bytes_sent_(0), 39 bytes_sent_(0),
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 497
498 int SOCKS5ClientSocket::GetPeerAddress(IPEndPoint* address) const { 498 int SOCKS5ClientSocket::GetPeerAddress(IPEndPoint* address) const {
499 return transport_->socket()->GetPeerAddress(address); 499 return transport_->socket()->GetPeerAddress(address);
500 } 500 }
501 501
502 int SOCKS5ClientSocket::GetLocalAddress(IPEndPoint* address) const { 502 int SOCKS5ClientSocket::GetLocalAddress(IPEndPoint* address) const {
503 return transport_->socket()->GetLocalAddress(address); 503 return transport_->socket()->GetLocalAddress(address);
504 } 504 }
505 505
506 } // namespace net 506 } // namespace net
OLDNEW
« no previous file with comments | « net/socket/client_socket_pool_manager_impl.h ('k') | net/socket/socks_client_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698