diff options
| -rw-r--r-- | net/base/address_list.cc | 3 | ||||
| -rw-r--r-- | net/url_request/url_request_view_net_internals_job.cc | 27 |
2 files changed, 22 insertions, 8 deletions
diff --git a/net/base/address_list.cc b/net/base/address_list.cc index 7a18f04..3492b3d 100644 --- a/net/base/address_list.cc +++ b/net/base/address_list.cc @@ -4,9 +4,8 @@ #include "net/base/address_list.h" -#ifdef OS_WIN +#if defined(OS_WIN) #include <ws2tcpip.h> -#include <wspiapi.h> // Needed for Win2k compat. #else #include <netdb.h> #endif diff --git a/net/url_request/url_request_view_net_internals_job.cc b/net/url_request/url_request_view_net_internals_job.cc index f8cf21c..56aa8a8 100644 --- a/net/url_request/url_request_view_net_internals_job.cc +++ b/net/url_request/url_request_view_net_internals_job.cc @@ -2,10 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <sstream> - #include "net/url_request/url_request_view_net_internals_job.h" +#if defined(OS_WIN) +#include <ws2tcpip.h> +#else +#include <netdb.h> +#endif + +#include <sstream> + #include "base/stl_util-inl.h" #include "base/string_util.h" #include "net/base/escape.h" @@ -219,7 +225,7 @@ class HostResolverCacheSubSection : public SubSection { out->append("<table border=1>" "<tr>" "<th>Host</th>" - "<th>First address</th>" + "<th>Address list</th>" "<th>Time to live (ms)</th>" "</tr>"); @@ -243,12 +249,21 @@ class HostResolverCacheSubSection : public SubSection { out->append("<tr style='color:blue'>"); } - std::string address_str = - net::NetAddressToString(entry->addrlist.head()); + // Stringify all of the addresses in the address list, separated + // by newlines (br). + std::string address_list_html; + const struct addrinfo* current_address = entry->addrlist.head(); + while (current_address) { + if (!address_list_html.empty()) + address_list_html += "<br>"; + address_list_html += EscapeForHTML( + net::NetAddressToString(current_address)); + current_address = current_address->ai_next; + } out->append(StringPrintf("<td>%s</td><td>%s</td><td>%d</td></tr>", EscapeForHTML(host).c_str(), - EscapeForHTML(address_str).c_str(), + address_list_html.c_str(), ttl_ms)); } else { // This was an entry that failed to be resolved. |