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

Side by Side Diff: net/quic/port_suggester.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/quic/crypto/quic_crypto_server_config.cc ('k') | net/socket/client_socket_pool_manager.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/quic/port_suggester.h" 5 #include "net/quic/port_suggester.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "net/base/host_port_pair.h" 8 #include "net/base/host_port_pair.h"
9 9
10 namespace net { 10 namespace net {
11 11
12 PortSuggester::PortSuggester(const HostPortPair& server, uint64 seed) 12 PortSuggester::PortSuggester(const HostPortPair& server, uint64 seed)
13 : call_count_(0), 13 : call_count_(0),
14 previous_suggestion_(-1) { 14 previous_suggestion_(-1) {
15 unsigned char hash_bytes[base::kSHA1Length]; 15 unsigned char hash_bytes[base::kSHA1Length];
16 base::SHA1HashBytes( 16 base::SHA1HashBytes(
17 reinterpret_cast<const unsigned char*>(server.host().data()), 17 reinterpret_cast<const unsigned char*>(server.host().data()),
18 server.host().length(), hash_bytes); 18 server.host().length(), hash_bytes);
19 COMPILE_ASSERT(sizeof(seed_) < sizeof(hash_bytes), seed_larger_than_hash); 19 static_assert(sizeof(seed_) < sizeof(hash_bytes), "seed larger than hash");
20 memcpy(&seed_, hash_bytes, sizeof(seed_)); 20 memcpy(&seed_, hash_bytes, sizeof(seed_));
21 seed_ ^= seed ^ server.port(); 21 seed_ ^= seed ^ server.port();
22 } 22 }
23 23
24 int PortSuggester::SuggestPort(int min, int max) { 24 int PortSuggester::SuggestPort(int min, int max) {
25 // Sometimes our suggestion can't be used, so we ensure that if additional 25 // Sometimes our suggestion can't be used, so we ensure that if additional
26 // calls are made, then each call (probably) provides a new suggestion. 26 // calls are made, then each call (probably) provides a new suggestion.
27 if (++call_count_ > 1) { 27 if (++call_count_ > 1) {
28 // Evolve the seed. 28 // Evolve the seed.
29 unsigned char hash_bytes[base::kSHA1Length]; 29 unsigned char hash_bytes[base::kSHA1Length];
(...skipping 10 matching lines...) Expand all
40 previous_suggestion_ = static_cast<int>(seed_ % range) + min; 40 previous_suggestion_ = static_cast<int>(seed_ % range) + min;
41 return previous_suggestion_; 41 return previous_suggestion_;
42 } 42 }
43 43
44 int PortSuggester::previous_suggestion() const { 44 int PortSuggester::previous_suggestion() const {
45 DCHECK_LT(0u, call_count_); 45 DCHECK_LT(0u, call_count_);
46 return previous_suggestion_; 46 return previous_suggestion_;
47 } 47 }
48 48
49 } // namespace net 49 } // namespace net
OLDNEW
« no previous file with comments | « net/quic/crypto/quic_crypto_server_config.cc ('k') | net/socket/client_socket_pool_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698