2019-10-23 15:26:02 +00:00
|
|
|
diff -up chromium-78.0.3904.70/net/dns/dns_util.cc.gcc-DohUpgradeEntry-nonconst chromium-78.0.3904.70/net/dns/dns_util.cc
|
2019-10-23 17:09:01 +00:00
|
|
|
--- chromium-78.0.3904.70/net/dns/dns_util.cc.gcc-DohUpgradeEntry-nonconst 2019-10-21 15:06:38.000000000 -0400
|
|
|
|
|
+++ chromium-78.0.3904.70/net/dns/dns_util.cc 2019-10-23 12:55:27.886546918 -0400
|
|
|
|
|
@@ -139,12 +139,12 @@ struct DohUpgradeEntry {
|
2019-10-23 15:26:02 +00:00
|
|
|
const DnsConfig::DnsOverHttpsServerConfig dns_over_https_config;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
-const std::vector<const DohUpgradeEntry>& GetDohUpgradeList() {
|
|
|
|
|
+const std::vector<DohUpgradeEntry>& GetDohUpgradeList() {
|
|
|
|
|
// The provider names in these entries should be kept in sync with the
|
|
|
|
|
// DohProviderId histogram suffix list in
|
|
|
|
|
// tools/metrics/histograms/histograms.xml.
|
|
|
|
|
- static const base::NoDestructor<std::vector<const DohUpgradeEntry>>
|
2019-10-23 17:09:01 +00:00
|
|
|
- upgradable_servers({
|
2019-10-23 15:26:02 +00:00
|
|
|
+ static const base::NoDestructor<std::vector<DohUpgradeEntry>>
|
2019-10-23 17:09:01 +00:00
|
|
|
+ upgradable_servers(std::initializer_list<DohUpgradeEntry>{
|
2019-10-23 15:26:02 +00:00
|
|
|
DohUpgradeEntry(
|
|
|
|
|
"CleanBrowsingAdult",
|
2019-10-23 17:09:01 +00:00
|
|
|
{"185.228.168.10", "185.228.169.11", "2a0d:2a00:1::1",
|
2019-10-23 15:26:02 +00:00
|
|
|
@@ -222,8 +222,7 @@ const std::vector<const DohUpgradeEntry>
|
|
|
|
|
std::vector<const DohUpgradeEntry*> GetDohUpgradeEntriesFromNameservers(
|
|
|
|
|
const std::vector<IPEndPoint>& dns_servers,
|
|
|
|
|
const std::vector<std::string>& excluded_providers) {
|
|
|
|
|
- const std::vector<const DohUpgradeEntry>& upgradable_servers =
|
|
|
|
|
- GetDohUpgradeList();
|
|
|
|
|
+ const std::vector<DohUpgradeEntry>& upgradable_servers = GetDohUpgradeList();
|
|
|
|
|
std::vector<const DohUpgradeEntry*> entries;
|
|
|
|
|
|
|
|
|
|
for (const auto& server : dns_servers) {
|
|
|
|
|
@@ -417,8 +416,7 @@ std::vector<DnsConfig::DnsOverHttpsServe
|
|
|
|
|
GetDohUpgradeServersFromDotHostname(
|
|
|
|
|
const std::string& dot_server,
|
|
|
|
|
const std::vector<std::string>& excluded_providers) {
|
|
|
|
|
- const std::vector<const DohUpgradeEntry>& upgradable_servers =
|
|
|
|
|
- GetDohUpgradeList();
|
|
|
|
|
+ const std::vector<DohUpgradeEntry>& upgradable_servers = GetDohUpgradeList();
|
|
|
|
|
std::vector<DnsConfig::DnsOverHttpsServerConfig> doh_servers;
|
|
|
|
|
|
|
|
|
|
if (dot_server.empty())
|
|
|
|
|
@@ -451,8 +449,7 @@ GetDohUpgradeServersFromNameservers(
|
|
|
|
|
|
|
|
|
|
std::string GetDohProviderIdForHistogramFromDohConfig(
|
|
|
|
|
const DnsConfig::DnsOverHttpsServerConfig& doh_server) {
|
|
|
|
|
- const std::vector<const DohUpgradeEntry>& upgradable_servers =
|
|
|
|
|
- GetDohUpgradeList();
|
|
|
|
|
+ const std::vector<DohUpgradeEntry>& upgradable_servers = GetDohUpgradeList();
|
|
|
|
|
for (const auto& upgrade_entry : upgradable_servers) {
|
|
|
|
|
if (doh_server.server_template ==
|
|
|
|
|
upgrade_entry.dns_over_https_config.server_template) {
|
