Add and persist a new field in AlternativeServiceInfo to list QUIC verisons advertised

net/http/http_server_properties.h

 // Copyright (c) 2012 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_HTTP_HTTP_SERVER_PROPERTIES_H_
 #define NET_HTTP_HTTP_SERVER_PROPERTIES_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <ostream>
 #include <string>
 #include <tuple>
 #include <vector>
 
 #include "base/containers/mru_cache.h"
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/net_export.h"
 #include "net/quic/core/quic_bandwidth.h"
 #include "net/quic/core/quic_server_id.h"
+#include "net/quic/core/quic_versions.h"
 #include "net/socket/next_proto.h"
 #include "net/spdy/core/spdy_framer.h"  // TODO(willchan): Reconsider this.
 #include "net/spdy/core/spdy_protocol.h"
 #include "url/scheme_host_port.h"
 
 namespace base {
 class Value;
 }
 
 namespace net {
@@ skipping 75 matching lines @@
   NextProto protocol;
   std::string host;
   uint16_t port;
 };
 
 NET_EXPORT_PRIVATE std::ostream& operator<<(
     std::ostream& os,
     const AlternativeService& alternative_service);
 
 struct NET_EXPORT AlternativeServiceInfo {
-  AlternativeServiceInfo() : alternative_service() {}
+  AlternativeServiceInfo();
+  ~AlternativeServiceInfo();
 
   AlternativeServiceInfo(const AlternativeService& alternative_service,
-                         base::Time expiration)
-      : alternative_service(alternative_service),
-        expiration(expiration) {}
+                         base::Time expiration);
 
-  AlternativeServiceInfo(NextProto protocol,
-                         const std::string& host,
-                         uint16_t port,
-                         base::Time expiration)
-      : alternative_service(protocol, host, port), expiration(expiration) {}
+  AlternativeServiceInfo(const AlternativeService& alternative_service,
+                         base::Time expirationi,

[Ryan Hamilton, 2017/06/07 20:52:23]

nit: trailing "i"?

[Zhongyi Shi, 2017/06/08 23:11:16]

Done.

+                         const QuicVersionVector& advertised_versions);
 
   AlternativeServiceInfo(
-      const AlternativeServiceInfo& alternative_service_info) = default;
+      const AlternativeServiceInfo& alternative_service_info);
+
   AlternativeServiceInfo& operator=(
-      const AlternativeServiceInfo& alternative_service_info) = default;
+      const AlternativeServiceInfo& alternative_service_info);
+
+  bool EqualAdvertisedVersions(const AlternativeServiceInfo& other) const;
+
+  void set_advertised_versions(const QuicVersionVector& advertised_versions) {
+    advertised_versions_ = advertised_versions;
+    std::sort(advertised_versions_.begin(), advertised_versions_.end());
+  }
 
   bool operator==(const AlternativeServiceInfo& other) const {
     return alternative_service == other.alternative_service &&
-           expiration == other.expiration;
+           expiration == other.expiration && EqualAdvertisedVersions(other);

[Ryan Hamilton, 2017/06/07 20:52:23]

can you just use advertised_versions == other.advertised_versions?

[Zhongyi Shi, 2017/06/08 23:11:16]

DONE.

I was trying to skip the versions comparison if the protocol is not H2. But now
that I have make advertised_versions_ private, and it's only set when protocol
is QUIC. Yeah, a simple equality check on the versions is safe!

   }
 
   bool operator!=(const AlternativeServiceInfo& other) const {
     return !this->operator==(other);
   }
 
   std::string ToString() const;
 
+  const QuicVersionVector& advertised_versions() const {
+    return advertised_versions_;
+  }

[Ryan Hamilton, 2017/06/07 20:52:23]

This is a struct not a class so the members are public. I think this means you
can skip the getter.

[Zhongyi Shi, 2017/06/08 23:11:16]

advertised_versions_ are marked as private (and I planned to change this struct
to class in a follow-up CL). I change the advertised_versions_ by intention so
that when we set it, it is guaranteed to be sorted. 

[Ryan Hamilton, 2017/06/08 23:53:16]

I think you're going to have to bit the bullet. This can be a class or a struct,
but right now it's kinda neither. If you really want to make this a class, then
you'll probably want to do that first.

+
   AlternativeService alternative_service;
   base::Time expiration;
+
+ private:
+  // Lists all the QUIC versions that are advertised by the server and supported
+  // by Chrome. If empty, defaults to versions used by the current instance of
+  // the netstack.
+  // This list MUST be sorted in ascending order.
+  QuicVersionVector advertised_versions_;
 };
 
 struct NET_EXPORT SupportsQuic {
   SupportsQuic() : used_quic(false) {}
   SupportsQuic(bool used_quic, const std::string& address)
       : used_quic(used_quic),
         address(address) {}
 
   bool Equals(const SupportsQuic& other) const {
     return used_quic == other.used_quic && address == other.address;
@@ skipping 85 matching lines @@
       const url::SchemeHostPort& origin) = 0;
 
   // Set a single alternative service for |origin|.  Previous alternative
   // services for |origin| are discarded.
   // |alternative_service.host| may be empty.
   // Return true if |alternative_service_map_| has changed significantly enough
   // that it should be persisted to disk.
   virtual bool SetAlternativeService(
       const url::SchemeHostPort& origin,
       const AlternativeService& alternative_service,
-      base::Time expiration) = 0;
+      base::Time expiration,
+      const QuicVersionVector& advertised_versions) = 0;
 
   // Set alternative services for |origin|.  Previous alternative services for
   // |origin| are discarded.
   // Hostnames in |alternative_service_info_vector| may be empty.
   // |alternative_service_info_vector| may be empty.
   // Return true if |alternative_service_map_| has changed significantly enough
   // that it should be persisted to disk.
   virtual bool SetAlternativeServices(
       const url::SchemeHostPort& origin,
       const AlternativeServiceInfoVector& alternative_service_info_vector) = 0;
@@ skipping 72 matching lines @@
   // Returns whether HttpServerProperties is initialized.
   virtual bool IsInitialized() const = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HttpServerProperties);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_SERVER_PROPERTIES_H_