Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 886ea8b0 authored by Mike Yu's avatar Mike Yu Committed by Automerger Merge Worker
Browse files

Temporarily add Google DNS64 to DoH upgrade list am: 4c80818e 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2375572



Change-Id: I211f3199cc7c6eccb9f96ccd4ccab874911154a1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8c4ae1c4 4c80818e

PrivateDnsConfiguration.h

+6 −1
Original line number Original line Diff line number Diff line
@@ -247,12 +247,17 @@ class PrivateDnsConfiguration { 




    // TODO: Move below DoH relevant stuff into Rust implementation.

    // TODO: Move below DoH relevant stuff into Rust implementation.

    std::map<unsigned, DohIdentity> mDohTracker GUARDED_BY(mPrivateDnsLock);

    std::map<unsigned, DohIdentity> mDohTracker GUARDED_BY(mPrivateDnsLock);

    std::array<DohProviderEntry, 4> mAvailableDoHProviders = {{

    std::array<DohProviderEntry, 5> mAvailableDoHProviders = {{

            {"Google",

            {"Google",

             {"2001:4860:4860::8888", "2001:4860:4860::8844", "8.8.8.8", "8.8.4.4"},

             {"2001:4860:4860::8888", "2001:4860:4860::8844", "8.8.8.8", "8.8.4.4"},

             "dns.google",

             "dns.google",

             "https://dns.google/dns-query",

             "https://dns.google/dns-query",

             false},

             false},

            {"Google DNS64",

             {"2001:4860:4860::64", "2001:4860:4860::6464"},

             "dns64.dns.google",

             "https://dns64.dns.google/dns-query",

             false},

            {"Cloudflare",

            {"Cloudflare",

             {"2606:4700::6810:f8f9", "2606:4700::6810:f9f9", "104.16.248.249", "104.16.249.249"},

             {"2606:4700::6810:f8f9", "2606:4700::6810:f9f9", "104.16.248.249", "104.16.249.249"},

             "cloudflare-dns.com",

             "cloudflare-dns.com",