Provide Shill IP Address to myIpAddress()

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 909 matching lines @@
   should_restart_with_blocking_dns_ = true;
 }
 
 bool ProxyResolverV8Tracing::Job::GetDnsFromLocalCache(
     const std::string& host,
     ResolveDnsOperation op,
     std::string* output,
     bool* return_value) {
   CheckIsOnWorkerThread();
 
+  if (op == MY_IP_ADDRESS || op == MY_IP_ADDRESS_EX) {

[eroman, 2014/04/21 22:54:47]

There is a difference between MY_IP_ADDRESS and MY_IP_ADDRESS_EX -- the former
is supposed to return ONLY ipv4 addresses. Whereas the latter can return IPv6
addresses. What is the IP address string that chrome os is setting?

[stevenjb, 2014/04/22 22:32:56]

Currently we only have ipv4 address available. I will add a comment and a link
to a bug tracking ipv6 support.

+    // If a system (e.g. Chrome OS) has specified an explicit IP address to
+    // use, return that.
+    std::string my_ip_address = host_resolver()->my_ip_address();

[eroman, 2014/04/21 22:54:47]

This is not correct. The HostResolver should only be operated on the IO thread,
however here it is running on a worker thread (see the assertion at the top of
this function).

You should probably be doing this as part of DoDnsOperation() or as part of the
HostResolver itself.

[stevenjb, 2014/04/22 22:32:56]

Ah, you are right. I will move this to DoDnsOperation() as you suggest. I
started doing that originally, but thought this would be simpler, not
considering the threading concerns.

+    if (!my_ip_address.empty()) {
+      *output = my_ip_address;
+      *return_value = true;
+      return true;
+    }
+  }
+
   DnsCache::const_iterator it = dns_cache_.find(MakeDnsCacheKey(host, op));
   if (it == dns_cache_.end())
     return false;
 
   *output = it->second;
   *return_value = !it->second.empty();
   return true;
 }
 
 void ProxyResolverV8Tracing::Job::SaveDnsToLocalCache(
@@ skipping 224 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