QUIC - use QuicSessionKey tuple (host, port, is_https) instead of server_hostname

net/quic/crypto/quic_crypto_client_config.h

 // Copyright 2013 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_QUIC_CRYPTO_CLIENT_CONFIG_H_
 #define NET_QUIC_CRYPTO_QUIC_CRYPTO_CLIENT_CONFIG_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 125 matching lines @@
 
     DISALLOW_COPY_AND_ASSIGN(CachedState);
   };
 
   QuicCryptoClientConfig();
   ~QuicCryptoClientConfig();
 
   // Sets the members to reasonable, default values.
   void SetDefaults();
 
-  // Create returns a CachedState for the given hostname. It creates a
+  // Create returns a CachedState for the given hostname and port. It creates a
   // CachedState and caches it. If |quic_server_info_factory| is not NULL, then
   // it is used to create QuicServerInfo which is used to fetch crypto config
   // information from disk for the given hostname.
   CachedState* Create(const std::string& server_hostname,
+                      uint16 port,

[wtc, 2014/03/11 01:41:39]

Can we replace the two argument with a HostPortPair argument?

Similarly for InitializeFrom.

[Ryan Hamilton, 2014/03/11 15:47:43]

As I understand it, HostPortPair is a chrome-ism which does not exist internally
so we decided to use the 2 arg route for shared code.  That being said, we could
easily port HostPortPair to the internal codebase.  Perhaps that would be
cleaner.  What do you guys this?

[ramant (doing other things), 2014/03/13 01:50:12]

Used QuicSessionKey and will port HostPortPair to shared code.

[ramant (doing other things), 2014/03/13 01:50:12]

Will port HostPortPair as we merge this CL into shared code.

                       QuicServerInfoFactory* quic_server_info_factory);
 
-  // LookupOrCreate returns a CachedState for the given hostname. If no such
-  // CachedState currently exists, it will be created and cached.
+  // LookupOrCreate returns a CachedState for the given hostname and port. If no
+  // such CachedState currently exists, it will be created and cached.
   // TODO(rtenneti): fix the server code and pass QuicServerInfoFactory as
   // argument.
-  CachedState* LookupOrCreate(const std::string& server_hostname);
+  CachedState* LookupOrCreate(const std::string& server_hostname, uint16 port);
 
   // FillInchoateClientHello sets |out| to be a CHLO message that elicits a
   // source-address token or SCFG from a server. If |cached| is non-NULL, the
   // source-address token will be taken from it. |out_params| is used in order
   // to store the cached certs that were sent as hints to the server in
   // |out_params->cached_certs|. |preferred_version| is the version of the QUIC
   // protocol that this client chose to use initially. This allows the server to
   // detect downgrade attacks.
   void FillInchoateClientHello(const std::string& server_hostname,
                                const QuicVersion preferred_version,
@@ skipping 57 matching lines @@
   void SetProofVerifier(ProofVerifier* verifier);
 
   ChannelIDSigner* channel_id_signer() const;
 
   // SetChannelIDSigner sets a ChannelIDSigner that will be called when the
   // server supports channel IDs to sign a message proving possession of the
   // given ChannelID. This object takes ownership of |signer|.
   void SetChannelIDSigner(ChannelIDSigner* signer);
 
   // Initialize the CachedState from |canonical_crypto_config| for the
-  // |canonical_server_hostname| as the initial CachedState for
-  // |server_hostname|. We will copy config data only if
-  // |canonical_crypto_config| has valid proof.
+  // |canonical_server_hostname| and |canonical_server_port| as the initial
+  // CachedState for |server_hostname| and |server_port|. We will copy config
+  // data only if |canonical_crypto_config| has valid proof.
   void InitializeFrom(const std::string& server_hostname,
+                      uint16 server_port,
                       const std::string& canonical_server_hostname,
+                      uint16 canonical_server_port,
                       QuicCryptoClientConfig* canonical_crypto_config);
 
  private:
   // cached_states_ maps from the server hostname to the cached information
   // about that server.
   std::map<std::string, CachedState*> cached_states_;
 
   scoped_ptr<ProofVerifier> proof_verifier_;
   scoped_ptr<ChannelIDSigner> channel_id_signer_;
 
   DISALLOW_COPY_AND_ASSIGN(QuicCryptoClientConfig);
 };
 
 }  // namespace net
 
 #endif  // NET_QUIC_CRYPTO_QUIC_CRYPTO_CLIENT_CONFIG_H_