ABANDONED Handle multiple AlternateProtocols for each HostPortPair.

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 <map>
 #include <string>
+#include <vector>
+
 #include "base/basictypes.h"
 #include "base/containers/mru_cache.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/net_export.h"
 #include "net/socket/next_proto.h"
 #include "net/spdy/spdy_framer.h"  // TODO(willchan): Reconsider this.
 #include "net/spdy/spdy_protocol.h"
 
@@ skipping 49 matching lines @@
 // ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION and
 // ALTERNATE_PROTOCOL_MAXIMUM_VALID_VERSION (inclusive).
 NET_EXPORT bool IsAlternateProtocolValid(AlternateProtocol protocol);
 
 enum AlternateProtocolSize {
   NUM_VALID_ALTERNATE_PROTOCOLS =
     ALTERNATE_PROTOCOL_MAXIMUM_VALID_VERSION -
     ALTERNATE_PROTOCOL_MINIMUM_VALID_VERSION + 1,
 };
 
-NET_EXPORT const char* AlternateProtocolToString(AlternateProtocol protocol);
-NET_EXPORT AlternateProtocol AlternateProtocolFromString(
-    const std::string& str);
-NET_EXPORT_PRIVATE AlternateProtocol AlternateProtocolFromNextProto(
-    NextProto next_proto);
+// TODO(bnc):  Rename to AlternateServiceInfo.
+struct NET_EXPORT AlternateProtocolInfo {
+  AlternateProtocolInfo()
+      : port(), protocol(UNINITIALIZED_ALTERNATE_PROTOCOL), probability() {}

[Ryan Hamilton, 2014/11/04 18:56:22]

Can you explicitly specify 0 for the numeric initializers?

[Bence, 2014/11/04 21:55:50]

Done.

 
-struct NET_EXPORT AlternateProtocolInfo {
   AlternateProtocolInfo(uint16 port,
                         AlternateProtocol protocol,
                         double probability)
       : port(port),
         protocol(protocol),
         probability(probability) {}
 
   bool Equals(const AlternateProtocolInfo& other) const {
     return port == other.port &&
         protocol == other.protocol &&
         probability == other.probability;
   }
 
+  bool EqualsModuloProbabilityAndProtocol(
+      const AlternateProtocolInfo& other) const {
+    return port == other.port;
+  }
+
   std::string ToString() const;
 
   uint16 port;
   AlternateProtocol protocol;
   double probability;
 };
 
 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;
   }
 
   bool used_quic;
   std::string address;
 };
 
-typedef base::MRUCache<
-    HostPortPair, AlternateProtocolInfo> AlternateProtocolMap;
+// TODO(bnc):  Rename to AlternateServices.
+typedef std::vector<AlternateProtocolInfo> AlternateProtocols;
+// TODO(bnc):  Rename to AlternateServicesMap.
+typedef base::MRUCache<HostPortPair, AlternateProtocols> AlternateProtocolMap;
 typedef base::MRUCache<HostPortPair, SettingsMap> SpdySettingsMap;
 typedef std::map<HostPortPair, SupportsQuic> SupportsQuicMap;
 
 extern const char kAlternateProtocolHeader[];
 
+NET_EXPORT const char* AlternateProtocolToString(AlternateProtocol protocol);
+// TODO(bnc):  Rename to AlternateServicesToString.
+NET_EXPORT std::string AlternateProtocolsToString(
+    const AlternateProtocols& services);
+NET_EXPORT AlternateProtocol
+    AlternateProtocolFromString(const std::string& str);
+NET_EXPORT_PRIVATE AlternateProtocol
+    AlternateProtocolFromNextProto(NextProto next_proto);
+
 // The interface for setting/retrieving the HTTP server properties.
 // Currently, this class manages servers':
 // * SPDY support (based on NPN results)
 // * Alternate-Protocol support
 // * Spdy Settings (like CWND ID field)
 class NET_EXPORT HttpServerProperties {
  public:
   struct NetworkStats {
     base::TimeDelta srtt;
     uint64 bandwidth_estimate;
@@ skipping 10 matching lines @@
 
   // Returns true if |server| supports SPDY.
   virtual bool SupportsSpdy(const HostPortPair& server) = 0;
 
   // Add |server| into the persistent store. Should only be called from IO
   // thread.
   virtual void SetSupportsSpdy(const HostPortPair& server,
                                bool support_spdy) = 0;
 
   // Returns true if |server| has an Alternate-Protocol header.
+  // TODO(bnc):  Rename to HasAlternateService.
   virtual bool HasAlternateProtocol(const HostPortPair& server) = 0;
 
-  // Returns the Alternate-Protocol and port for |server|.
+  // Returns the Alternate-Protocols for |server|.
   // HasAlternateProtocol(server) must be true.
-  virtual AlternateProtocolInfo GetAlternateProtocol(
+  virtual const AlternateProtocols& GetAlternateProtocols(
       const HostPortPair& server) = 0;
 
-  // Sets the Alternate-Protocol for |server|.
-  virtual void SetAlternateProtocol(const HostPortPair& server,
+  // Adds an Alternate-Protocol for |server|.
+  // TODO(bnc):  Rename to AddAlternateService.
+  virtual void AddAlternateProtocol(const HostPortPair& server,
                                     uint16 alternate_port,
                                     AlternateProtocol alternate_protocol,
                                     double probability) = 0;
 
-  // Sets the Alternate-Protocol for |server| to be BROKEN.
-  virtual void SetBrokenAlternateProtocol(const HostPortPair& server) = 0;
+  // Sets a given Alternate-Protocol for |server| to be BROKEN.
+  virtual void SetBrokenAlternateProtocol(
+      const HostPortPair& server,
+      const AlternateProtocolInfo& broken_alternate_protocol) = 0;
 
-  // Returns true if Alternate-Protocol for |server| was recently BROKEN.
+  // Returns true if given Alternate-Protocol for |server| was recently BROKEN.
   virtual bool WasAlternateProtocolRecentlyBroken(
-      const HostPortPair& server) = 0;
+      const HostPortPair& server,
+      const AlternateProtocolInfo& alternate_protocol) = 0;
 
-  // Confirms that Alternate-Protocol for |server| is working.
-  virtual void ConfirmAlternateProtocol(const HostPortPair& server) = 0;
+  // Confirms that given Alternate-Protocol for |server| is working.
+  virtual void ConfirmAlternateProtocol(
+      const HostPortPair& server,
+      const AlternateProtocolInfo& alternate_protocol) = 0;
 
-  // Clears the Alternate-Protocol for |server|.
+  // Clears all Alternate-Protocols for |server|.
+  // TODO(bnc):  Rename to ClearAlternateServices.
   virtual void ClearAlternateProtocol(const HostPortPair& server) = 0;
 
+  // Removes an Alternate-Protocol for |server|.
+  // TODO(bnc):  Rename to RemoveAlternateService.
+  virtual void RemoveAlternateProtocol(
+      const HostPortPair& server,
+      const AlternateProtocolInfo& alternate_protocol) = 0;
+
   // Returns all Alternate-Protocol mappings.
+  // TODO(bnc):  Rename to alternate_services_map.
   virtual const AlternateProtocolMap& alternate_protocol_map() const = 0;
 
   // Sets the threshold to be used when evaluating Alternate-Protocol
   // advertisments. Only advertisements with a with a probability
   // greater than |threshold| will be honored. |threshold| must be
   // between 0 and 1 inclusive. Hence, a threshold of 0 implies that
   // all advertisements will be honored.
   virtual void SetAlternateProtocolProbabilityThreshold(
       double threshold) = 0;
 
@@ skipping 34 matching lines @@
   virtual const NetworkStats* GetServerNetworkStats(
       const HostPortPair& host_port_pair) const = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HttpServerProperties);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_SERVER_PROPERTIES_H_