Flag myIpAddress requests for chromeos

net/proxy/proxy_resolver_v8_tracing.cc

 // Copyright (c) 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.
 
 #include "net/proxy/proxy_resolver_v8_tracing.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/stringprintf.h"
@@ skipping 951 matching lines @@
   }
 
   dns_cache_[MakeDnsCacheKey(host, op)] = cache_value;
 }
 
 // static
 HostResolver::RequestInfo ProxyResolverV8Tracing::Job::MakeDnsRequestInfo(
     const std::string& host, ResolveDnsOperation op) {
   HostPortPair host_port = HostPortPair(host, 80);
   if (op == MY_IP_ADDRESS || op == MY_IP_ADDRESS_EX) {
     host_port.set_host(GetHostName());

[eroman, 2014/06/26 03:13:47]

Lets not set the host in the case of trying to resolve "my ip address". 

How about adding a constructor for RequestInfo() that takes 0 parameters. And
then have some setter for "set_is_my_ip_address()".

This will require adding some logic to HostResolverImpl to test for if
is_my_ip_address(), and if so using an effective host of GetHostName().

(Or in the future, hopefully doing something better on other platforms too).

[stevenjb, 2014/06/26 03:36:45]

That sounds reasonable, but I'd be worried about breaking existing
(non-chromeos) implementations if we did any of that. Maybe add a TODO instead?

[stevenjb, 2014/06/26 03:40:35]

To be clear: I would like to keep this as simple as possible so that we can
safely merge this CL to 37. Otherwise I will need to revert the previous CL and
put this on ice for a while longer (I'm swamped for 38).

[eroman, 2014/06/26 19:58:46]

ok that's reasonable. How about making set_is_my_ip_address() internally call
set_host(GetHostName()), and attaching a TODO() to check for is_my_ip_address()
in the implementation?

(Then you can remove the set_host(GetHostName()) from this file).

[stevenjb, 2014/06/26 22:04:36]

I *think* I understand what you are suggesting, but I would still want to test
that carefully, and at that point I think your original suggestion probably
makes more sense.

I will move the TODO here and leave it unassigned since there does not appear to
be a good owner.

   }
 
   HostResolver::RequestInfo info(host_port);
-
+  // Flag myIpAddress requests.
+  if (op == MY_IP_ADDRESS || op == MY_IP_ADDRESS_EX) {
+    HostResolverFlags flags =
+        info.host_resolver_flags() | HOST_RESOLVER_MY_IP_ADDRESS;
+    info.set_host_resolver_flags(flags);
+  }
   // The non-ex flavors are limited to IPv4 results.
   if (op == MY_IP_ADDRESS || op == DNS_RESOLVE) {
     info.set_address_family(ADDRESS_FAMILY_IPV4);
   }
 
   return info;
 }
 
 std::string ProxyResolverV8Tracing::Job::MakeDnsCacheKey(
     const std::string& host, ResolveDnsOperation op) {
@@ skipping 177 matching lines @@
   DCHECK(!set_pac_script_job_.get());
   CHECK_EQ(0, num_outstanding_callbacks_);
 
   set_pac_script_job_ = new Job(this);
   set_pac_script_job_->StartSetPacScript(script_data, callback);
 
   return ERR_IO_PENDING;
 }
 
 }  // namespace net