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

Unified Diff: net/quic/crypto/cached_network_parameters.h

Issue 734063004: Update from https://crrev.com/304418 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/congestion_control/tcp_cubic_sender_test.cc ('k') | net/quic/crypto/cached_network_parameters.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/crypto/cached_network_parameters.h
diff --git a/net/quic/crypto/source_address_token.h b/net/quic/crypto/cached_network_parameters.h
similarity index 65%
copy from net/quic/crypto/source_address_token.h
copy to net/quic/crypto/cached_network_parameters.h
index 76c3454defabba090605d69d028b8e70dad064cc..5f22070dc4f75f8156916dfdf1aedb11ac2d842f 100644
--- a/net/quic/crypto/source_address_token.h
+++ b/net/quic/crypto/cached_network_parameters.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Copyright (c) 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef NET_QUIC_CRYPTO_SOURCE_ADDRESS_TOKEN_H_
-#define NET_QUIC_CRYPTO_SOURCE_ADDRESS_TOKEN_H_
+#ifndef NET_QUIC_CRYPTO_CACHED_NETWORK_PARAMETERS_H_
+#define NET_QUIC_CRYPTO_CACHED_NETWORK_PARAMETERS_H_
#include <string>
@@ -104,62 +104,6 @@ class NET_EXPORT_PRIVATE CachedNetworkParameters {
int64 timestamp_;
};
-// TODO(rtenneti): sync with server more rationally.
-// A SourceAddressToken is serialised, encrypted and sent to clients so that
-// they can prove ownership of an IP address.
-class NET_EXPORT_PRIVATE SourceAddressToken {
- public:
- SourceAddressToken();
- ~SourceAddressToken();
-
- std::string SerializeAsString() const;
-
- bool ParseFromArray(const char* plaintext, size_t plaintext_length);
-
- std::string ip() const {
- return ip_;
- }
- void set_ip(base::StringPiece ip) {
- ip_ = ip.as_string();
- }
-
- int64 timestamp() const {
- return timestamp_;
- }
- void set_timestamp(int64 timestamp) {
- timestamp_ = timestamp;
- }
-
- const CachedNetworkParameters& cached_network_parameters() const {
- return cached_network_parameters_;
- }
- void set_cached_network_parameters(
- const CachedNetworkParameters& cached_network_parameters) {
- cached_network_parameters_ = cached_network_parameters;
- has_cached_network_parameters_ = true;
- }
- bool has_cached_network_parameters() const {
- return has_cached_network_parameters_;
- }
-
- private:
- // ip_ contains either 4 (IPv4) or 16 (IPv6) bytes of IP address in network
- // byte order.
- std::string ip_;
- // timestamp_ contains a UNIX timestamp value of the time when the token was
- // created.
- int64 timestamp_;
-
- // The server can provide estimated network parameters to be used for
- // initial parameter selection in future connections.
- CachedNetworkParameters cached_network_parameters_;
- // TODO(rtenneti): Delete |has_cached_network_parameters_| after we convert
- // SourceAddressToken to protobuf.
- bool has_cached_network_parameters_;
-
- DISALLOW_COPY_AND_ASSIGN(SourceAddressToken);
-};
-
} // namespace net
-#endif // NET_QUIC_CRYPTO_SOURCE_ADDRESS_TOKEN_H_
+#endif // NET_QUIC_CRYPTO_CACHED_NETWORK_PARAMETERS_H_
« no previous file with comments | « net/quic/congestion_control/tcp_cubic_sender_test.cc ('k') | net/quic/crypto/cached_network_parameters.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698