Changed SPDY's ip connection pooling logic to only add the used IP,

net/spdy/spdy_session_unittest.cc

 // Copyright (c) 2011 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.
 
 #include "net/spdy/spdy_session.h"
 
 #include "net/spdy/spdy_io_buffer.h"
 #include "net/spdy/spdy_session_pool.h"
 #include "net/spdy/spdy_stream.h"
 #include "net/spdy/spdy_test_util.h"
@@ skipping 399 matching lines @@
 // If |clean_via_close_current_sessions| is false, the sessions are closed
 // manually, calling SpdySessionPool::Remove() directly.  If it is true,
 // sessions are closed with SpdySessionPool::CloseCurrentSessions().
 void IPPoolingTest(bool clean_via_close_current_sessions) {
   const int kTestPort = 80;
   struct TestHosts {
     std::string name;
     std::string iplist;
     HostPortProxyPair pair;
   } test_hosts[] = {
-    { "www.foo.com",    "192.168.0.1,192.168.0.5" },
-    { "images.foo.com", "192.168.0.2,192.168.0.3,192.168.0.5" },
+    { "www.foo.com",    "192.0.2.33,192.168.0.1,192.168.0.5" },
+    { "images.foo.com", "192.168.0.2,192.168.0.3,192.168.0.5,192.0.2.33" },
     { "js.foo.com",     "192.168.0.4,192.168.0.3" },
   };
 
   SpdySessionDependencies session_deps;
   session_deps.host_resolver->set_synchronous_mode(true);
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_hosts); i++) {
     session_deps.host_resolver->rules()->AddIPLiteralRule(test_hosts[i].name,
         test_hosts[i].iplist, "");
 
     // This test requires that the HostResolver cache be populated.  Normal
@@ skipping 38 matching lines @@
                           false,
                           false));
   scoped_ptr<ClientSocketHandle> connection(new ClientSocketHandle);
   EXPECT_EQ(OK,
             connection->Init(test_host_port_pair.ToString(),
                              transport_params, MEDIUM,
                              NULL, http_session->transport_socket_pool(),
                              BoundNetLog()));
   EXPECT_EQ(OK, session->InitializeWithSocket(connection.release(), false, OK));
 
+  // MockClientSocket::GetPeerAddress return's 0 as the port number for the
+  // host. HasSession looks up addresses with port 80. AddAliases adds addresses
+  // with port 80 into session_pool's aliases for |test_hosts[0].pair|.
+  SpdySessionPoolPeer pool_peer(spdy_session_pool);
+  pool_peer.AddAliases(test_hosts[0].pair);

[willchan no longer on Chromium, 2011/07/17 12:44:47]

Sorry, I wasn't clear. I'd prefer you just do AddAlias() rather than
AddAliases(). The reason is that this more closely mirrors what the code is
actually doing now. When we create a new SpdySession, we add only one
ipport=>hostname mapping in InitalizeWithSocket(). That's why I think it's wrong
to have an AddAliases() which adds multiple mappings. I think you should only
add the single mapping.

That said, I think we can also fix this by changing
MockClientsocket::GetPeerAddress() to return port 80. That's the more typical
port to return. We shouldn't be returning 0. I don't think anything will break
if you do this, but if something breaks and it looks nontrivial to fix, don't
worry about it and just use pool_peer.AddAlias().

[ramant (doing other things), 2011/07/17 19:45:34]

Done.

+
   // Flush the SpdySession::OnReadComplete() task.
   MessageLoop::current()->RunAllPending();
 
   // The third host has no overlap with the first, so it can't pool IPs.
   EXPECT_FALSE(spdy_session_pool->HasSession(test_hosts[2].pair));
 
   // The second host overlaps with the first, and should IP pool.
   EXPECT_TRUE(spdy_session_pool->HasSession(test_hosts[1].pair));
 
   // Verify that the second host, through a proxy, won't share the IP.
@@ skipping 76 matching lines @@
 
   test_settings_storage->Set(test_host_port_pair, test_settings);
   EXPECT_NE(0u, test_settings_storage->Get(test_host_port_pair).size());
   spdy_session_pool->OnIPAddressChanged();
   EXPECT_EQ(0u, test_settings_storage->Get(test_host_port_pair).size());
 }
 
 }  // namespace
 
 }  // namespace net